X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=jcc.h;h=fba29af18821980167b4f853a7c0b7ef842e9b4c;hb=614fae69575c6fc11b2b887534e465eaf2ecdab3;hp=d229e3d25f074d060dda9ee35096f62e282458b5;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git diff --git a/jcc.h b/jcc.h index d229e3d2..fba29af1 100644 --- a/jcc.h +++ b/jcc.h @@ -1,9 +1,9 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.12.2.3 2006/01/21 16:16:08 david__schmidt Exp $" +#define JCC_H_VERSION "$Id: jcc.h,v 1.15 2006/09/02 10:24:30 fabiankeil Exp $" /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/jcc.h,v $ + * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ * * Purpose : Main file. Contains main() method, main loop, and * the main connection-handling function. @@ -35,6 +35,18 @@ * * Revisions : * $Log: jcc.h,v $ + * Revision 1.15 2006/09/02 10:24:30 fabiankeil + * Include pthread.h for OpenBSD to make Privoxy build again. + * + * Tested shortly on OpenBSD 3.9 without problems, but the OpenBSD + * port has additional patches to use the mutexes OSX_DARWIN needs, + * and it should be investigated if they are still required for + * reliable operation. + * + * Revision 1.14 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) + * * Revision 1.12.2.3 2006/01/21 16:16:08 david__schmidt * Thanks to Edward Carrel for his patch to modernize OSX's pthreads support. See bug #1409623. * @@ -131,13 +143,15 @@ extern int no_daemon; extern int g_terminate; #endif -#ifdef OSX_DARWIN +#if defined(OSX_DARWIN) || defined(__OpenBSD__) #include +#ifdef OSX_DARWIN extern pthread_mutex_t gmtime_mutex; extern pthread_mutex_t localtime_mutex; +#endif /* def OSX_DARWIN */ extern pthread_mutex_t gethostbyaddr_mutex; extern pthread_mutex_t gethostbyname_mutex; -#endif /* def OSX_DARWIN */ +#endif /* defined(OSX_DARWIN) || defined(__OpenBSD__) */ #ifdef FEATURE_PTHREAD extern pthread_mutex_t log_mutex;