Tidying up #defines:

[privoxy.git] / config.h.in

diff --git a/config.h.in b/config.h.in
index a66962b..1eae1fc 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
-#ifndef _CONFIG_H
-#define _CONFIG_H
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/acconfig.h,v $
@@ -38,6 +38,18 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
+ *    Revision 1.9  2001/07/29 19:08:52  jongfoster
+ *    Changing _CONFIG_H to CONFIG_H_INCLUDED.
+ *    Also added protection against using a MinGW32 or CygWin version of
+ *    config.h from within MS Visual C++
+ *
+ *    Revision 1.8  2001/07/29 17:09:17  jongfoster
+ *    Major changes to build system in order to fix these bugs:
+ *    - pthreads under Linux was broken - changed -lpthread to -pthread
+ *    - Compiling in MinGW32 mode under CygWin now correctly detects
+ *      which shared libraries are available
+ *    - Solaris support (?) (Not tested under Solaris yet)
+ *
  *    Revision 1.7  2001/07/25 22:53:59  jongfoster
  *    Will #error if pthreads is enabled under BeOs
  *
@@ -299,6 +311,24 @@
  */
 #undef FEATURE_PTHREAD
 
+/*
+ * Defined on Solaris only.  Makes the system libraries thread safe.
+ */
+#undef _REENTRANT
+
+/*
+ * Defined on Solaris only.  Without this, many important functions are not
+ * defined in the system headers.
+ */
+#undef __EXTENSIONS__
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with MultiThreading?)
+ */
+#undef __MT__
+
 /* Define if you have the bcopy function.  */
 #undef HAVE_BCOPY
 
@@ -308,6 +338,15 @@
 /* Define if you have the strerror function.  */
 #undef HAVE_STRERROR
 
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with ANSI Standard C?)
+ */
+#ifndef __STDC__
+#define __STDC__ 1
+#endif /* ndef __STDC__ */
+
 /*
  * Need to set up this define only for the Pthreads library for
  * Win32, available from http://sources.redhat.com/pthreads-win32/
@@ -326,4 +365,13 @@
 #endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
 
 
-#endif /* _CONFIG_H */
+/*
+ * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h
+ * under VC++, and it usually gives many wierd error messages.  Let's make
+ * the error messages understandable, by bailing out now.
+ */
+#ifdef _MSC_VER
+#error For MS VC++, please use config.h.win or config.h.win32threads.win.  You can usually do this by selecting the "Build", "Clean" menu option.
+#endif /* def _MSC_VER */
+
+#endif /* CONFIG_H_INCLUDED */