X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=vc_config_winthreads.h;h=7e51e74c627a51d9a494ed78913c57bde44ede0d;hp=6be09c36823c3bf38272cb89c57ed8b83bceb657;hb=f4107f65b676b63a199fe4230e58695757f9f199;hpb=c3f9302fd88848faaec72d8dc232221511533c8c diff --git a/vc_config_winthreads.h b/vc_config_winthreads.h index 6be09c36..7e51e74c 100644 --- a/vc_config_winthreads.h +++ b/vc_config_winthreads.h @@ -2,7 +2,7 @@ #define CONFIG_H_INCLUDED /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/config.h.win32threads.win,v $ + * File : $Source: /cvsroot/ijbswa/current/vc_config_winthreads.h,v $ * * Purpose : This file should be the first thing included in every * .c file. (Before even system headers). It contains @@ -36,7 +36,23 @@ * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Revisions : - * $Log: config.h.win32threads.win,v $ + * $Log: vc_config_winthreads.h,v $ + * Revision 1.5 2006/07/18 14:48:47 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.3.2.1 2006/04/08 21:57:26 david__schmidt + * Synchronize with a more modern copy of config.h. + * + * Revision 1.3 2002/05/03 22:54:24 jongfoster + * Version number bump to 2.9.15 + * + * Revision 1.2 2002/04/26 18:26:09 jongfoster + * Bumping version numbers + * + * Revision 1.1 2002/04/06 20:38:01 jongfoster + * Renaming VC++ versions of config.h + * * Revision 1.14 2002/03/26 22:29:54 swa * we have a new homepage! * @@ -186,27 +202,27 @@ /* * Version number - Major (X._._) */ -#define VERSION_MAJOR 2 +#define VERSION_MAJOR 0 /* * Version number - Minor (_.X._) */ -#define VERSION_MINOR 9 +#define VERSION_MINOR 0 /* * Version number - Point (_._.X) */ -#define VERSION_POINT 13 +#define VERSION_POINT 0 /* * Version number, as a string */ -#define VERSION "2.9.13" +#define VERSION "0.0.0" /* * Status of the code: alpha, beta or stable */ -#define CODE_STATUS "beta" +#define CODE_STATUS "UNRELEASED" /* * Regular expression matching for URLs. (Highly recommended). @@ -299,9 +315,9 @@ #define FEATURE_IMAGE_DETECT_MSIE 1 /* - * Kills JavaScript popups - window.open, onunload, etc. + * Use PNG instead of GIF for built-in images */ -#define FEATURE_KILL_POPUPS 1 +/* #undef FEATURE_NO_GIFS */ /* * Use POSIX threads instead of native threads. @@ -351,43 +367,208 @@ */ #define __MT__ 1 +/* If the (nonstandard and thread-safe) function gethostbyname_r + * is available, select which signature to use + */ +/* #undef HAVE_GETHOSTBYNAME_R_6_ARGS */ +/* #undef HAVE_GETHOSTBYNAME_R_5_ARGS */ +/* #undef HAVE_GETHOSTBYNAME_R_3_ARGS */ + +/* If the (nonstandard and thread-safe) function gethostbyaddr_r + * is available, select which signature to use + */ +/* #undef HAVE_GETHOSTBYADDR_R_8_ARGS */ +/* #undef HAVE_GETHOSTBYADDR_R_7_ARGS */ +/* #undef HAVE_GETHOSTBYADDR_R_5_ARGS */ + +/* Defined if you have gmtime_r and localtime_r with a signature + * of (struct time *, struct tm *) + */ +#undef HAVE_GMTIME_R + +/* #define HAVE_LOCALTIME_R 1 */ + +/* Define to 'int' if doesn't have it. + */ +#define socklen_t int + +/* Define if pcre.h must be included as + */ +/* #undef PCRE_H_IN_SUBDIR */ + +/* Define if pcreposix.h must be included as + */ +/* #undef PCREPOSIX_H_IN_SUBDIR */ + + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 /* Define if you have the `bcopy' function. */ /* #define HAVE_BCOPY 1 */ +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `gethostbyaddr' function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define to 1 if you have the `gethostbyname' function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + /* Define if you have the header file. */ /* #define HAVE_INTTYPES_H 1 */ +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef HAVE_LIBNSL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + /* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 /* Define if you have the header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OS_H */ + +/* Define to 1 if you have the `regcomp' function. */ +#define HAVE_REGCOMP 1 + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `socket' function. */ +#define HAVE_SOCKET 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + /* Define if you have the header file. */ /* #define HAVE_STDINT_H 1 */ /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + /* Define if you have the `strerror' function. */ #define HAVE_STRERROR 1 +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + /* Define if you have the header file. */ /* #define HAVE_STRINGS_H 1 */ /* Define if you have the header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + /* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + /* Define if you have the header file. */ /* #define HAVE_UNISTD_H 1 */ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to 1 if the `setpgrp' function takes no argument. */ +#define SETPGRP_VOID 1 + /* The size of a `char *', as computed by sizeof. */ #define SIZEOF_CHAR_P 4 @@ -406,12 +587,24 @@ /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #define const */ +/* Define to `int' if does not define. */ +/* #undef pid_t */ + /* Define to `unsigned' if does not define. */ /* #define size_t unsigned */ +/* Define to 'int' if doesn't have it. */ +#define socklen_t int + /* * Defined always. * FIXME: Don't know what it does or why we need it. @@ -431,6 +624,13 @@ #define __CLEANUP_C #endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ +/* + * Need to keep errlog.c from trying to inline the non-existent + * locking stubs. Could be removed once a real platform-specific + * solution is generated. + */ +#define inline "" + /* * BEOS does not currently support POSIX threads. * This *should* be detected by ./configure, but let's be sure.