From: jongfoster Date: Sun, 29 Jul 2001 19:09:45 +0000 (+0000) Subject: Rebuilt based on latest acconfig.h X-Git-Tag: v_2_9_9~182 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=23a3fc78f43e536a03b66373d4d92b29f88b708a Rebuilt based on latest acconfig.h --- diff --git a/config.h.in b/config.h.in index 503b25ed..1eae1fc1 100644 --- 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,11 @@ * * 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 @@ -360,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 */