From e1cac5061a4803568a8dc86932fe6013aad8178c Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Fri, 18 Aug 2006 16:03:17 +0000 Subject: [PATCH] Tweak for OS/2 build happiness. --- errlog.c | 6 +++++- miscutil.c | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/errlog.c b/errlog.c index 1d0cb803..f89a13e2 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.42 2006/07/18 14:48:46 david__schmidt Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.43 2006/08/03 02:46:41 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,10 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.42 2006/07/18 14:48:46 david__schmi * * Revisions : * $Log: errlog.c,v $ + * Revision 1.43 2006/08/03 02:46:41 david__schmidt + * Incorporate Fabian Keil's patch work: + * http://www.fabiankeil.de/sourcecode/privoxy/ + * * Revision 1.42 2006/07/18 14:48:46 david__schmidt * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) * with what was really the latest development (the v_3_0_branch branch) diff --git a/miscutil.c b/miscutil.c index 1f6f0c4e..1e40c986 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.39 2006/07/18 14:48:46 david__schmidt Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.40 2006/08/17 17:15:10 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,22 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.39 2006/07/18 14:48:46 david__s * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.40 2006/08/17 17:15:10 fabiankeil + * - Back to timegm() using GnuPG's replacement if necessary. + * Using mktime() and localtime() could add a on hour offset if + * the randomize factor was big enough to lead to a summer/wintertime + * switch. + * + * - Removed now-useless Privoxy 3.0.3 compatibility glue. + * + * - Moved randomization code into pick_from_range(). + * + * - Changed parse_header_time definition. + * time_t isn't guaranteed to be signed and + * if it isn't, -1 isn't available as error code. + * Changed some variable types in client_if_modified_since() + * because of the same reason. + * * Revision 1.39 2006/07/18 14:48:46 david__schmidt * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) * with what was really the latest development (the v_3_0_branch branch) @@ -1046,7 +1062,7 @@ long int pick_from_range(long int range) #ifndef HAVE_RANDOM unsigned int weak_seed; - weak_seed = (unsigned int)(time(NULL) | range); + weak_seed = (unsigned int)((unsigned int)time(NULL) | (unsigned int)range); srand(weak_seed); /* * Some rand implementations aren't that random and return mostly -- 2.49.0