Re: [privoxy-devel] [privoxy-commits] current errlog.c, 1.94, 1.95 cgi.c, 1.117, 1.118 jbsockets.c, 1.59, 1.60 parsers.c, 1.164, 1.165

[Lee <le...@gm...>]

These lines:
#elif def MUTEX_LOCKS_AVAILABLE

in parsers.c gave me compile errors:
gcc -c -pipe -O2   -mwindows -mno-cygwin -Wall -Ipcre   parsers.c -o parsers.o
parsers.c:2283:11: missing binary operator before token "MUTEX_LOCKS_AVAILABLE"
parsers.c:2313:11: missing binary operator before token "MUTEX_LOCKS_AVAILABLE"
parsers.c:3033:11: missing binary operator before token "MUTEX_LOCKS_AVAILABLE"
make: *** [parsers.o] Error 1


According to http://www.hobbyprojects.com/c_programming_resource/define-undef-ifdef-ifndef.html
"#ifdef id" is the same as "#if defined(id)" so I tried changing the
three instances of
#elif def MUTEX_LOCKS_AVAILABLE
in parsers.c to
#elif defined(MUTEX_LOCKS_AVAILABLE)
and Privoxy compiled with no errors.

I tried visiting
http://personalfirewall.comodo.com/comodo-security-pro.html after
adding
{ +hide-if-modified-since{-60} \
 +overwrite-last-modified{randomize} \
 +crunch-if-none-match}
/
to user.action & no problems until I enabled javascript... at which
point Privoxy promptly crashed.

Tried the new version of Privoxy & no problems, so I'm not sure if I
should change all instances of "#elif def " to "#elif defined(" or if
there's a better way to fix the compile time errors..

Lee



On 5/28/09, no...@so... <no...@so...> wrote:
> Update of /cvsroot/ijbswa/current
> In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20450
>
> Modified Files:
> 	errlog.c cgi.c jbsockets.c parsers.c
> Log Message:
> Check the right macro to decide if we can use privoxy_mutex_lock().
>
> Should fix the crash-while-randomizing-header-dates bug on mingw32
> anonymously reported in #2797798. This is pretty much the same bug
> that was already fixed in 3.0.7, but apparently I found a way to
> reintroduce it in 3.0.11. Yeehaw.
>
>
> Index: errlog.c
> ===================================================================
> RCS file: /cvsroot/ijbswa/current/errlog.c,v
> retrieving revision 1.94
> retrieving revision 1.95
> diff -u -d -r1.94 -r1.95
> --- errlog.c	19 May 2009 17:47:22 -0000	1.94
> +++ errlog.c	28 May 2009 17:07:42 -0000	1.95
> @@ -427,7 +427,7 @@
>
>  #ifdef HAVE_LOCALTIME_R
>     tm_now = *localtime_r(&now, &tm_now);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>     privoxy_mutex_lock(&localtime_mutex);
>     tm_now = *localtime(&now);
>     privoxy_mutex_unlock(&localtime_mutex);
> @@ -485,7 +485,7 @@
>     time (&now);
>  #ifdef HAVE_GMTIME_R
>     gmt = *gmtime_r(&now, &gmt);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>     privoxy_mutex_lock(&gmtime_mutex);
>     gmt = *gmtime(&now);
>     privoxy_mutex_unlock(&gmtime_mutex);
> @@ -494,7 +494,7 @@
>  #endif
>  #ifdef HAVE_LOCALTIME_R
>     tm_now = localtime_r(&now, &dummy);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>     privoxy_mutex_lock(&localtime_mutex);
>     tm_now = localtime(&now);
>     privoxy_mutex_unlock(&localtime_mutex);
>
> Index: cgi.c
> ===================================================================
> RCS file: /cvsroot/ijbswa/current/cgi.c,v
> retrieving revision 1.117
> retrieving revision 1.118
> diff -u -d -r1.117 -r1.118
> --- cgi.c	16 May 2009 13:27:20 -0000	1.117
> +++ cgi.c	28 May 2009 17:07:42 -0000	1.118
> @@ -62,12 +62,12 @@
>  #if defined(FEATURE_CGI_EDIT_ACTIONS) || defined(FEATURE_TOGGLE)
>  #include "cgiedit.h"
>  #endif /* defined(FEATURE_CGI_EDIT_ACTIONS) || defined (FEATURE_TOGGLE) */
> -#include "loadcfg.h"
> +
>  /* loadcfg.h is for global_toggle_state only */
> -#ifdef FEATURE_PTHREAD
> -#include "jcc.h"
> +#include "loadcfg.h"
>  /* jcc.h is for mutex semaphore globals only */
> -#endif /* def FEATURE_PTHREAD */
> +#include "jcc.h"
> +
>  const char cgi_h_rcs[] = CGI_H_VERSION;
>
>  /*
> @@ -1409,7 +1409,7 @@
>     /* get and save the gmt */
>  #if HAVE_GMTIME_R
>     t = gmtime_r(&current_time, &dummy);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>     privoxy_mutex_lock(&gmtime_mutex);
>     t = gmtime(&current_time);
>     privoxy_mutex_unlock(&gmtime_mutex);
> @@ -1465,7 +1465,7 @@
>
>  #if HAVE_LOCALTIME_R
>     timeptr = localtime_r(&current_time, &dummy);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>     privoxy_mutex_lock(&localtime_mutex);
>     timeptr = localtime(&current_time);
>     privoxy_mutex_unlock(&localtime_mutex);
>
> Index: jbsockets.c
> ===================================================================
> RCS file: /cvsroot/ijbswa/current/jbsockets.c,v
> retrieving revision 1.59
> retrieving revision 1.60
> diff -u -d -r1.59 -r1.60
> --- jbsockets.c	25 May 2009 15:43:34 -0000	1.59
> +++ jbsockets.c	28 May 2009 17:07:42 -0000	1.60
> @@ -95,10 +95,8 @@
>
>  #include "project.h"
>
> -#ifdef FEATURE_PTHREAD
> +/* For mutex semaphores only */
>  #include "jcc.h"
> -/* jcc.h is for mutex semaphores only */
> -#endif /* def FEATURE_PTHREAD */
>
>  #include "jbsockets.h"
>  #include "filters.h"
> @@ -947,7 +945,7 @@
>        {
>           host = NULL;
>        }
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>        privoxy_mutex_lock(&resolver_mutex);
>        host = gethostbyaddr((const char *)&server.sin_addr,
>                             sizeof(server.sin_addr), AF_INET);
> @@ -1113,7 +1111,7 @@
>        {
>           hostp = NULL;
>        }
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>        privoxy_mutex_lock(&resolver_mutex);
>        while (NULL == (hostp = gethostbyname(host))
>               && (h_errno == TRY_AGAIN) && (dns_retries++ <
> MAX_DNS_RETRIES))
>
> Index: parsers.c
> ===================================================================
> RCS file: /cvsroot/ijbswa/current/parsers.c,v
> retrieving revision 1.164
> retrieving revision 1.165
> diff -u -d -r1.164 -r1.165
> --- parsers.c	25 May 2009 15:42:40 -0000	1.164
> +++ parsers.c	28 May 2009 17:07:42 -0000	1.165
> @@ -2280,7 +2280,7 @@
>        now = time(NULL);
>  #ifdef HAVE_GMTIME_R
>        gmtime_r(&now, &gmt);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>        privoxy_mutex_lock(&gmtime_mutex);
>        gmtime(&now);
>        privoxy_mutex_unlock(&gmtime_mutex);
> @@ -2310,7 +2310,7 @@
>              last_modified += rtime;
>  #ifdef HAVE_GMTIME_R
>              timeptr = gmtime_r(&last_modified, &gmt);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>              privoxy_mutex_lock(&gmtime_mutex);
>              timeptr = gmtime(&last_modified);
>              privoxy_mutex_unlock(&gmtime_mutex);
> @@ -3030,7 +3030,7 @@
>              tm += rtime * (negative ? -1 : 1);
>  #ifdef HAVE_GMTIME_R
>              timeptr = gmtime_r(&tm, &gmt);
> -#elif FEATURE_PTHREAD
> +#elif def MUTEX_LOCKS_AVAILABLE
>              privoxy_mutex_lock(&gmtime_mutex);
>              timeptr = gmtime(&tm);
>              privoxy_mutex_unlock(&gmtime_mutex);
>
>
> ------------------------------------------------------------------------------
> Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
> is a gathering of tech-side developers & brand creativity professionals.
> Meet
> the minds behind Google Creative Lab, Visual Complexity, Processing, &
> iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
> Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
> _______________________________________________
> ijbswa-commits mailing list
> ijb...@li...
> https://lists.sourceforge.net/lists/listinfo/ijbswa-commits
>