-/* config.h. Generated automatically by configure. */
-/* 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/config.h.win32threads.win,v $
*
* Revisions :
* $Log: config.h.win32threads.win,v $
- * Revision 1.2 2001/07/21 18:00:07 jongfoster
+ * 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
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.8 2001/07/25 19:16:27 oes
+ * Bumping version number to 2.9.8
+ *
+ * Revision 1.7 2001/07/21 18:00:07 jongfoster
* Bumping version number to 2.9.7
*
- * Revision 1.1 2001/07/15 20:08:40 jongfoster
+ * Revision 1.6 2001/07/15 20:08:40 jongfoster
* New build files for VC++ which provide the option of POSIX
* or Win32 threads.
*
*********************************************************************/
\f
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
/*
* Version number - Major (X._._)
*/
/*
* 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
* If neither of these are defined then you can ony use prefix matching.
* Don't bother to change this here! Use configure instead.
*/
-/* #undef REGEX_GNU */
+/* #define REGEX_GNU 1 */
#define REGEX_PCRE 1
/*
#define STATIC_PCRS 1
/*
- * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
- * non-anonymizing proxy. This is useful if you're trying to access a
- * blocked or broken site - just change the setting in the config file
- * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows
- * GUI).
- */
-#define TOGGLE 1
-
-/*
- * If a stream is compressed via gzip (Netscape specific I think), then
- * it cannot be modified with Perl regexps. This forces it to be
- * uncompressed.
+ * Allows the use of an ACL to control access to the proxy by IP address.
*/
-#define DENY_GZIP 1
+#define FEATURE_ACL 1
/*
- * Enables statistics function.
+ * Enables the web-based configuration (actionsfile) editor. If you
+ * have a shared proxy, you might want to turn this off.
*/
-#define STATISTICS 1
+#define FEATURE_CGI_EDIT_ACTIONS 1
/*
- * Bypass filtering for 1 page only
+ * Allows the use of jar files to capture cookies.
*/
-#define FORCE_LOAD 1
+#define FEATURE_COOKIE_JAR 1
/*
* Locally redirect remote script-redirect URLs
*/
-#define FAST_REDIRECTS 1
+#define FEATURE_FAST_REDIRECTS 1
/*
- * Split the show-proxy-args page into a page for each config file.
- */
-#define SPLIT_PROXY_ARGS 1
-
-/*
- * Kills JavaScript popups - window.open, onunload, etc.
+ * Bypass filtering for 1 page only
*/
-#define KILLPOPUPS 1
+#define FEATURE_FORCE_LOAD 1
/*
- * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail
+ * Allow blocking using images as well as HTML.
+ * If you do not define this then everything is blocked as HTML.
+ *
+ * Note that this is required if you want to use FEATURE_IMAGE_DETECT_MSIE.
*/
-#define WEBDAV 1
+#define FEATURE_IMAGE_BLOCKING 1
/*
* Detect image requests automatically for MSIE. Will fall back to
* other image-detection methods (i.e. "+image" permission) for other
* browsers.
*
- * You must also define IMAGE_BLOCKING to use this feature.
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.
*
* It detects the following header pair as an image request:
*
* These limitations are due to IE making inconsistent choices
* about which "Accept:" header to send.
*/
-#define DETECT_MSIE_IMAGES 1
+#define FEATURE_IMAGE_DETECT_MSIE 1
/*
- * Allow blocking using images as well as HTML.
- * If you do not define this then everything is blocked as HTML.
- *
- * Note that this is required if you want to use DETECT_MSIE_IMAGES.
+ * Kills JavaScript popups - window.open, onunload, etc.
*/
-#define IMAGE_BLOCKING 1
+#define FEATURE_KILL_POPUPS 1
/*
- * Allows the use of ACL files to control access to the proxy by IP address.
+ * Use POSIX threads instead of native threads.
+ */
+/* #define FEATURE_PTHREAD 1 */
+
+/*
+ * Enables statistics function.
*/
-#define ACL_FILES 1
+#define FEATURE_STATISTICS 1
+
+/*
+ * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
+ * non-anonymizing proxy. This is useful if you're trying to access a
+ * blocked or broken site - just change the setting in the config file,
+ * or use the handy "Disable" menu option in the Windows GUI.
+ */
+#define FEATURE_TOGGLE 1
/*
* Allows the use of trust files.
*/
-#define TRUST_FILES 1
+#define FEATURE_TRUST 1
+
+
+/****************************************************************************
+ * The following values are correct for MS VC++97.
+ * You should normally not change them.
+ ***************************************************************************/
+
/*
- * Allows the use of jar files to capture cookies.
+ * Defined on Solaris only. Makes the system libraries thread safe.
*/
-#define JAR_FILES 1
+/* #define _REENTRANT 1 */
/*
- * Use POSIX threads instead of native threads.
+ * Defined on Solaris only. Without this, many important functions are not
+ * defined in the system headers.
*/
-/* #undef FEATURE_PTHREAD */
+/* #define __EXTENSIONS__ 1 */
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with MultiThreading?)
+ */
+#define __MT__ 1
+
-/* Define if you have the bcopy function. */
-#define HAVE_BCOPY 1
+/* Define if you have the `bcopy' function. */
+/* #define HAVE_BCOPY 1 */
-/* Define if you have the memmove function. */
+/* Define if you have the <inttypes.h> header file. */
+/* #define HAVE_INTTYPES_H 1 */
+
+/* Define if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
-/* Define if you have the strerror function. */
+/* Define if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the <stdint.h> header file. */
+/* #define HAVE_STDINT_H 1 */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the `strerror' function. */
#define HAVE_STRERROR 1
+/* Define if you have the <strings.h> header file. */
+/* #define HAVE_STRINGS_H 1 */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file. */
+/* #define HAVE_UNISTD_H 1 */
+
+/* The size of a `char *', as computed by sizeof. */
+#define SIZEOF_CHAR_P 4
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `long long', as computed by sizeof. */
+/* #define SIZEOF_LONG_LONG ---not supported--- */
+
+/* The size of a `size_t', as computed by sizeof. */
+#define SIZEOF_SIZE_T 4
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #define const */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #define size_t unsigned */
+
+/*
+ * Defined always.
+ * FIXME: Don't know what it does or why we need it.
+ * (presumably something to do with ANSI Standard C?)
+ */
+/* Don't define for MS VC++ or you don't get strdup() declared.
+#ifndef __STDC__
+#define __STDC__ 1
+#endif
+*/
+
/*
* Need to set up this define only for the Pthreads library for
* Win32, available from http://sources.redhat.com/pthreads-win32/
#define __CLEANUP_C
#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */
-#endif /* _CONFIG_H */
+/*
+ * BEOS does not currently support POSIX threads.
+ * This *should* be detected by ./configure, but let's be sure.
+ */
+#if defined(FEATURE_PTHREAD) && defined(__BEOS__)
+#error BEOS does not support pthread - please run ./configure again with "--disable-pthread"
+
+#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
+
+
+#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 /* (!defined(_MSC_VER)) && (!defined(RC_INVOKED)) */
+
+#endif /* CONFIG_H_INCLUDED */
+
projects / privoxy.git / blobdiff