X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config.h.win32threads.win;h=ca26b8c55b8e6e8544ee3d6b2c2cb6a37f1075b7;hp=4488821d379c9976e22df976aaa21682e37622b6;hb=0365c0342275eacf37fb4c9b0721f2df9e709713;hpb=9a1d436fbe1d55e4080c02c6c02d9fdc47f83171

diff --git a/config.h.win32threads.win b/config.h.win32threads.win
index 4488821d..ca26b8c5 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 
@@ -11,7 +11,7 @@
  *                getting ludicrously long with feature defines.
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *                Privoxy team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -36,7 +36,29 @@
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Revisions   :
- *    $Log: config.h.win,v $
+ *    $Log: config.h.win32threads.win,v $
+ *    Revision 1.11  2002/03/16 14:27:22  jongfoster
+ *    Ignoring a very common warning.
+ *
+ *    Revision 1.10  2002/03/13 00:28:32  jongfoster
+ *    Hiding all the warnings generated by #include<windows.h>
+ *
+ *    Revision 1.9  2001/11/30 21:35:54  jongfoster
+ *    Bumping version number to 2.9.10
+ *
+ *    Revision 1.8  2001/10/23 21:24:09  jongfoster
+ *    Support for FEATURE_CGI_EDIT_ACTIONS
+ *
+ *    Revision 1.7  2001/10/07 15:33:14  oes
+ *    Removed FEATURE_DENY_GZIP
+ *    Bumped up version number
+ *
+ *    Revision 1.6  2001/09/16 16:59:34  jongfoster
+ *    Bugfix - couldn't build resources with previous version.
+ *
+ *    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
@@ -165,12 +187,12 @@
 /*
  * Version number - Point (_._.X)
  */
-#define VERSION_POINT 8
+#define VERSION_POINT 10
 
 /*
  * Version number, as a string
  */
-#define VERSION "2.9.8"
+#define VERSION "2.9.10"
 
 /*
  * Status of the code: alpha, beta or stable
@@ -207,16 +229,15 @@
 #define FEATURE_ACL 1
 
 /*
- * Allows the use of jar files to capture cookies.
+ * Enables the web-based configuration (actionsfile) editor.  If you
+ * have a shared proxy, you might want to turn this off.
  */
-#define FEATURE_COOKIE_JAR 1
+#define FEATURE_CGI_EDIT_ACTIONS 1
 
 /*
- * If a stream is compressed via gzip, then it cannot be filtered through
- * the PCRE regexps.  (Commonly happens with Netscape browsers).
- * This forces it to be uncompressed.
+ * Allows the use of jar files to capture cookies.
  */
-#define FEATURE_DENY_GZIP 1
+#define FEATURE_COOKIE_JAR 1
 
 /*
  * Locally redirect remote script-redirect URLs
@@ -411,9 +432,32 @@
 #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)) */
+
+#pragma warning ( disable: 4100 4115 4201 4214 4244 4514 )
+
+/*
+ * C4100 : unreferenced formal parameter
+ * Very common, not a bug
+ * 
+ * C4115 : named type definition in parentheses
+ * #include <windows.h> causes a warning about one of these.
+ *
+ * C4201 : nonstandard extension used : nameless struct/union
+ * Endemic in <windows.h>
+ *
+ * C4214 nonstandard extension used : bit field types other than int
+ * Endemic in <windows.h>
+ *
+ * C4244 conversion from 'int' to 'char', possible loss of data
+ * Should really fix this one.  Throughout the JB code.
+ *
+ * C4514 unreferenced inline/local function has been removed
+ * Caused by #include <windows.h>
+ */
+
 
 #endif /* CONFIG_H_INCLUDED */