From: jongfoster Date: Sun, 16 Sep 2001 16:59:34 +0000 (+0000) Subject: Bugfix - couldn't build resources with previous version. X-Git-Tag: v_2_9_9~74 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=b803cb8f1b89c6935dd15e764118475fd4a4195a Bugfix - couldn't build resources with previous version. --- diff --git a/config.h.win b/config.h.win index 5089cd73..3fb1947e 100755 --- a/config.h.win +++ b/config.h.win @@ -37,6 +37,9 @@ * * Revisions : * $Log: config.h.win,v $ + * Revision 1.10 2001/09/16 16:19:02 jongfoster + * New version based on latest configure.in and acconfig.h + * * Revision 1.9 2001/07/30 22:16:07 jongfoster * Tidying up #defines: * - All feature #defines are now of the form FEATURE_xxx @@ -411,9 +414,9 @@ #endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ -#ifndef _MSC_VER +#if (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) #error This file is only intended for MS VC++ on Win32. For other compilers, please run configure. -#endif /* def _MSC_VER */ +#endif /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */ #endif /* CONFIG_H_INCLUDED */ diff --git a/config.h.win32threads.win b/config.h.win32threads.win index 4488821d..ff570d64 100644 --- a/config.h.win32threads.win +++ b/config.h.win32threads.win @@ -2,7 +2,7 @@ #define CONFIG_H_INCLUDED /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/config.h.win,v $ + * File : $Source: /cvsroot/ijbswa/current/config.h.win32threads.win,v $ * * Purpose : This file should be the first thing included in every * .c file. (Before even system headers). It contains @@ -36,7 +36,10 @@ * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Revisions : - * $Log: config.h.win,v $ + * $Log: config.h.win32threads.win,v $ + * Revision 1.5 2001/09/16 16:19:02 jongfoster + * New version based on latest configure.in and acconfig.h + * * Revision 1.9 2001/07/30 22:16:07 jongfoster * Tidying up #defines: * - All feature #defines are now of the form FEATURE_xxx @@ -411,9 +414,9 @@ #endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ -#ifndef _MSC_VER +#if (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) #error This file is only intended for MS VC++ on Win32. For other compilers, please run configure. -#endif /* def _MSC_VER */ +#endif /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */ #endif /* CONFIG_H_INCLUDED */