--------------------- PatchSet 3610 Date: 2006/08/29 20:32:25 Author: serassio Branch: nt Tag: (none) Log: Use config.h for missing integer types definition Members: include/squid_mswin.h:1.1.2.4->1.1.2.5 port/win32/include/autoconf.h:1.2.18.15->1.2.18.16 Index: squid3/include/squid_mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/squid_mswin.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/include/squid_mswin.h 29 Aug 2006 19:38:52 -0000 1.1.2.4 +++ squid3/include/squid_mswin.h 29 Aug 2006 20:32:25 -0000 1.1.2.5 @@ -1,5 +1,5 @@ /* - * $Id: squid_mswin.h,v 1.1.2.4 2006/08/29 19:38:52 serassio Exp $ + * $Id: squid_mswin.h,v 1.1.2.5 2006/08/29 20:32:25 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -46,18 +46,9 @@ #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ -typedef char int8_t; -typedef unsigned char uint8_t; -typedef unsigned char u_int8_t; -typedef short int int16_t; typedef unsigned short uint16_t; -typedef unsigned short u_int16_t; -typedef int int32_t; typedef unsigned int uint32_t; -typedef unsigned int u_int32_t; -typedef __int64 int64_t; typedef unsigned __int64 uint64_t; -typedef unsigned __int64 u_int64_t; typedef long pid_t; typedef int ssize_t; Index: squid3/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/autoconf.h,v retrieving revision 1.2.18.15 retrieving revision 1.2.18.16 diff -u -r1.2.18.15 -r1.2.18.16 --- squid3/port/win32/include/autoconf.h 17 Jun 2006 22:01:53 -0000 1.2.18.15 +++ squid3/port/win32/include/autoconf.h 29 Aug 2006 20:32:29 -0000 1.2.18.16 @@ -98,6 +98,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ +/* char is defined in system headers */ +#define HAVE_CHAR 1 + /* Define to 1 if you have the `crypt' function. */ #define HAVE_CRYPT 1 @@ -201,6 +204,9 @@ /* int64_t is defined in system headers */ #define HAVE_INT64_T 1 +/* int8_t is defined in system headers */ +/* #undef HAVE_INT8_T */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_INTTYPES_H */ @@ -387,6 +393,9 @@ /* pad128_t is defined in system headers */ /* #undef HAVE_PAD128_T */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PATHS_H */ + /* pid_t is defined by the system headers */ #define HAVE_PID_T 1 @@ -481,6 +490,9 @@ /* Define to 1 if you have the `setsid' function. */ /* #undef HAVE_SETSID */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHADOW_H */ + /* Define if you have the shl_load function. */ /* #undef HAVE_SHL_LOAD */ @@ -544,6 +556,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strsep' function. */ +/* #undef HAVE_STRSEP */ + /* Define to 1 if `ip_hl' is member of `struct iphdr'. */ /* #undef HAVE_STRUCT_IPHDR_IP_HL */ @@ -657,6 +672,9 @@ /* uint64_t is defined in system headers */ #define HAVE_UINT64_T 1 +/* uint8_t is defined in system headers */ +/* #undef HAVE_UINT8_T */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_UNISTD_H */ @@ -670,13 +688,16 @@ /* #undef HAVE_UTIME_H */ /* u_int16_t is defined in system headers */ -#define HAVE_U_INT16_T 1 +/* #undef HAVE_U_INT16_T */ /* u_int32_t is defined in system headers */ -#define HAVE_U_INT32_T 1 +/* #undef HAVE_U_INT32_T */ /* u_int64_t is defined in system headers */ -#define HAVE_U_INT64_T 1 +/* #undef HAVE_U_INT64_T */ + +/* u_int8_t is defined in system headers */ +/* #undef HAVE_U_INT8_T */ /* Define to 1 if you have the header file. */ #define HAVE_VARARGS_H 1 @@ -737,6 +758,9 @@ /* Print stacktraces on fatal errors */ /* #undef PRINT_STACK_TRACE */ +/* The size of a `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 + /* The size of a `int', as computed by sizeof. */ #define SIZEOF_INT 4 @@ -749,6 +773,9 @@ /* The size of a `int64_t', as computed by sizeof. */ #define SIZEOF_INT64_T 8 +/* The size of a `int8_t', as computed by sizeof. */ +/* #undef SIZEOF_INT8_T */ + /* The size of a `long', as computed by sizeof. */ #define SIZEOF_LONG 4 @@ -773,6 +800,9 @@ /* The size of a `uint64_t', as computed by sizeof. */ #define SIZEOF_UINT64_T 8 +/* The size of a `uint8_t', as computed by sizeof. */ +/* #undef SIZEOF_UINT8_T */ + /* The size of a `u_int16_t', as computed by sizeof. */ /* #undef SIZEOF_U_INT16_T */ @@ -782,6 +812,9 @@ /* The size of a `u_int64_t', as computed by sizeof. */ /* #undef SIZEOF_U_INT64_T */ +/* The size of a `u_int8_t', as computed by sizeof. */ +/* #undef SIZEOF_U_INT8_T */ + /* The size of a `void *', as computed by sizeof. */ #define SIZEOF_VOID_P 4 @@ -900,7 +933,10 @@ #define USE_USERAGENT_LOG 1 /* Define to enable WCCP */ -#define USE_WCCP 0 +/* #undef USE_WCCP */ + +/* Define to enable WCCP V2 */ +/* #undef USE_WCCPv2 */ /* Define Windows NT & Windows 2000 run service mode */ #define USE_WIN32_SERVICE 1