From e95abe7fc63d100186dd1da179f11fa10dc3a8b0 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 6 Nov 2006 19:58:23 +0000
Subject: [PATCH] Move pthread.h inclusion from jcc.c to jcc.h. Fixes build on
 x86-freebsd1 (FreeBSD 5.4-RELEASE).

---
 jcc.c | 13 ++++++++-----
 jcc.h | 15 +++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/jcc.c b/jcc.c
index adaaa9d9..370ef7fd 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.104 2006/09/23 13:26:38 roro Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.105 2006/11/06 14:26:02 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,13 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.104 2006/09/23 13:26:38 roro Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.105  2006/11/06 14:26:02  fabiankeil
+ *    Don't exit after receiving the second SIGHUP on Solaris.
+ *
+ *    Fixes BR 1052235, but the same problem may exist on other
+ *    systems. Once 3.0.6 is out we should use sigset()
+ *    where available and see if it breaks anything.
+ *
  *    Revision 1.104  2006/09/23 13:26:38  roro
  *    Replace TABs by spaces in source code.
  *
@@ -675,10 +682,6 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.104 2006/09/23 13:26:38 roro Exp $";
 #include <fcntl.h>
 #include <errno.h>
 
-#ifdef FEATURE_PTHREAD
-#include <pthread.h>
-#endif /* def FEATURE_PTHREAD */
-
 #ifdef _WIN32
 # ifndef FEATURE_PTHREAD
 #  ifndef STRICT
diff --git a/jcc.h b/jcc.h
index fba29af1..5b49ff98 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.15 2006/09/02 10:24:30 fabiankeil Exp $"
+#define JCC_H_VERSION "$Id: jcc.h,v 1.16 2006/09/02 15:36:42 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.h,v $
@@ -35,6 +35,10 @@
  *
  * Revisions   :
  *    $Log: jcc.h,v $
+ *    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.
  *
@@ -143,8 +147,11 @@ extern int no_daemon;
 extern int g_terminate;
 #endif
 
-#if defined(OSX_DARWIN) || defined(__OpenBSD__)
+#ifdef FEATURE_PTHREAD
 #include <pthread.h>
+extern pthread_mutex_t log_mutex;
+extern pthread_mutex_t log_init_mutex;
+#if defined(OSX_DARWIN) || defined(__OpenBSD__)
 #ifdef OSX_DARWIN
 extern pthread_mutex_t gmtime_mutex;
 extern pthread_mutex_t localtime_mutex;
@@ -152,10 +159,6 @@ extern pthread_mutex_t localtime_mutex;
 extern pthread_mutex_t gethostbyaddr_mutex;
 extern pthread_mutex_t gethostbyname_mutex;
 #endif /* defined(OSX_DARWIN) || defined(__OpenBSD__) */
-
-#ifdef FEATURE_PTHREAD
-extern pthread_mutex_t log_mutex;
-extern pthread_mutex_t log_init_mutex;
 #endif /* FEATURE_PTHREAD */
 
 /* Functions */
-- 
2.39.2