X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=jcc.h;h=9da00cf1316abd025c2fbad8314e2a79f4ac7cb6;hb=d55afc696ab392e92c44352cbe8b93ddd2724ef6;hp=b821a7c9453ed9bf14c202d61b153364ee551115;hpb=9988f554a0fa118d4e5bdc68ee151011d882b3fc;p=privoxy.git

diff --git a/jcc.h b/jcc.h
index b821a7c9..9da00cf1 100644
--- a/jcc.h
+++ b/jcc.h
@@ -1,6 +1,6 @@
 #ifndef JCC_H_INCLUDED
 #define JCC_H_INCLUDED
-#define JCC_H_VERSION "$Id: jcc.h,v 1.14 2006/07/18 14:48:46 david__schmidt Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.18 2006/11/13 19:05:51 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
@@ -8,7 +8,7 @@
  * Purpose     :  Main file.  Contains main() method, main loop, and 
  *                the main connection-handling function.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2006 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -35,6 +35,32 @@
  *
  * Revisions   :
  *    $Log: jcc.h,v $
+ *    Revision 1.18  2006/11/13 19:05:51  fabiankeil
+ *    Make pthread mutex locking more generic. Instead of
+ *    checking for OSX and OpenBSD, check for FEATURE_PTHREAD
+ *    and use mutex locking unless there is an _r function
+ *    available. Better safe than sorry.
+ *
+ *    Fixes "./configure --disable-pthread" and should result
+ *    in less threading-related problems on pthread-using platforms,
+ *    but it still doesn't fix BR#1122404.
+ *
+ *    Revision 1.17  2006/11/06 19:58:23  fabiankeil
+ *    Move pthread.h inclusion from jcc.c to jcc.h.
+ *    Fixes build on x86-freebsd1 (FreeBSD 5.4-RELEASE).
+ *
+ *    Revision 1.16  2006/09/02 15:36:42  fabiankeil
+ *    Follow the OpenBSD port's lead and protect the resolve
+ *    functions on OpenBSD as well.
+ *
+ *    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)
@@ -135,20 +161,26 @@ extern int no_daemon;
 extern int g_terminate;
 #endif
 
-#if defined(OSX_DARWIN) || defined(__OpenBSD__)
+#ifdef FEATURE_PTHREAD
 #include <pthread.h>
-#endif /* defined(OSX_DARWIN) || defined(__OpenBSD__) */
+extern pthread_mutex_t log_mutex;
+extern pthread_mutex_t log_init_mutex;
 
-#ifdef OSX_DARWIN
+#ifndef HAVE_GMTIME_R
 extern pthread_mutex_t gmtime_mutex;
+#endif /* ndef HAVE_GMTIME_R */
+
+#ifndef HAVE_LOCALTIME_R
 extern pthread_mutex_t localtime_mutex;
+#endif /* ndef HAVE_GMTIME_R */
+
+#ifndef HAVE_GETHOSTBYADDR_R
 extern pthread_mutex_t gethostbyaddr_mutex;
-extern pthread_mutex_t gethostbyname_mutex;
-#endif /* def OSX_DARWIN */
+#endif /* ndef HAVE_GETHOSTBYADDR_R */
 
-#ifdef FEATURE_PTHREAD
-extern pthread_mutex_t log_mutex;
-extern pthread_mutex_t log_init_mutex;
+#ifndef HAVE_GETHOSTBYNAME_R
+extern pthread_mutex_t gethostbyname_mutex;
+#endif /* ndef HAVE_GETHOSTBYNAME_R */
 #endif /* FEATURE_PTHREAD */
 
 /* Functions */
@@ -163,6 +195,14 @@ int main(int argc, const char *argv[]);
 extern const char jcc_rcs[];
 extern const char jcc_h_rcs[];
 
+/* HTTP snippets */
+extern const char CSUCCEED[];
+extern const char CHEADER[];
+extern const char CFORBIDDEN[];
+extern const char FTP_RESPONSE[];
+extern const char GOPHER_RESPONSE[];
+extern const char MISSING_DESTINATION_RESPONSE[];
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif