--------------------- PatchSet 8577 Date: 2006/09/01 12:55:14 Author: serassio Branch: nt Tag: (none) Log: Now integer types are checked/defined during configure Members: include/squid_mswin.h:1.1.2.5->1.1.2.6 port/win32/include/autoconf.h:1.1.38.10->1.1.38.11 Index: squid/include/squid_mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/squid_mswin.h,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid/include/squid_mswin.h 1 Sep 2006 12:30:53 -0000 1.1.2.5 +++ squid/include/squid_mswin.h 1 Sep 2006 12:55:14 -0000 1.1.2.6 @@ -1,5 +1,5 @@ /* - * $Id: squid_mswin.h,v 1.1.2.5 2006/09/01 12:30:53 serassio Exp $ + * $Id: squid_mswin.h,v 1.1.2.6 2006/09/01 12:55:14 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -43,13 +43,7 @@ #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ -typedef char int8_t; typedef unsigned char u_char; -typedef unsigned char uint8_t; -typedef unsigned char u_int8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned __int64 uint64_t; typedef int SOCKET; typedef int ssize_t; Index: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.38.10 retrieving revision 1.1.38.11 diff -u -r1.1.38.10 -r1.1.38.11 --- squid/port/win32/include/autoconf.h 12 Aug 2006 19:26:38 -0000 1.1.38.10 +++ squid/port/win32/include/autoconf.h 1 Sep 2006 12:55:14 -0000 1.1.38.11 @@ -328,6 +328,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENSSL_SSL_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PATHS_H */ + /* Define to 1 if you have the `poll' function. */ /* #undef HAVE_POLL */ @@ -637,18 +640,24 @@ /* 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 /* Size of SIZEOF_INT16_T */ -#define SIZEOF_INT16_T 2 +#define SIZEOF_INT16_T 0 /* Size of SIZEOF_INT32_T */ -#define SIZEOF_INT32_T 4 +#define SIZEOF_INT32_T 0 /* Size of SIZEOF_INT64_T */ #define SIZEOF_INT64_T 8 +/* Size of SIZEOF_INT8_T */ +#define SIZEOF_INT8_T 0 + /* The size of a `long', as computed by sizeof. */ #define SIZEOF_LONG 4 @@ -665,22 +674,28 @@ #define SIZEOF_SIZE_T 4 /* Size of SIZEOF_UINT16_T */ -#define SIZEOF_UINT16_T 2 +#define SIZEOF_UINT16_T 0 /* Size of SIZEOF_UINT32_T */ -#define SIZEOF_UINT32_T 4 +#define SIZEOF_UINT32_T 0 /* Size of SIZEOF_UINT64_T */ -#define SIZEOF_UINT64_T 8 +#define SIZEOF_UINT64_T 0 + +/* Size of SIZEOF_UINT8_T */ +#define SIZEOF_UINT8_T 0 /* Size of SIZEOF_U_INT16_T */ -#define SIZEOF_U_INT16_T 2 +#define SIZEOF_U_INT16_T 0 /* Size of SIZEOF_U_INT32_T */ -#define SIZEOF_U_INT32_T 4 +#define SIZEOF_U_INT32_T 0 /* Size of SIZEOF_U_INT64_T */ -#define SIZEOF_U_INT64_T 8 +#define SIZEOF_U_INT64_T 0 + +/* Size of SIZEOF_U_INT8_T */ +#define SIZEOF_U_INT8_T 0 /* The size of a `void *', as computed by sizeof. */ #define SIZEOF_VOID_P 4 @@ -823,7 +838,7 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define to `int' if does not define. */ +/* Have int datatype */ #define fd_mask int /* Define to `__inline__' or `__inline' if that's what the C compiler @@ -838,22 +853,25 @@ /* Have long datatype */ #define int32_t int -/* Have unsigned __int64 datatype */ +/* Have __int64 datatype */ #define int64_t __int64 -/* Define to `unsigned short' if does not define. */ +/* Have char datatype */ +#define int8_t char + +/* Have unsigned short datatype */ /* #undef mode_t */ /* message type for message queues */ #define mtyp_t long -/* Define to `int' if does not define. */ +/* Have int datatype */ /* #undef off_t */ -/* Define to `int' if does not define. */ +/* Have int datatype */ #define pid_t int -/* Define to `unsigned int' if does not define. */ +/* Have unsigned int datatype */ /* #undef size_t */ /* This makes warnings go away. If you have socklen_t defined in your @@ -861,7 +879,7 @@ defined to int. */ #define socklen_t int -/* Define to `int' if does not define. */ +/* Have int datatype */ /* #undef ssize_t */ /* Have unsigned int datatype */ @@ -870,9 +888,24 @@ /* Have unsigned long datatype */ #define u_int32_t unsigned int -/* Have unsigned long long datatype */ +/* Have unsigned __int64 datatype */ #define u_int64_t unsigned __int64 +/* Have unsigned char datatype */ +#define u_int8_t unsigned char + +/* Have unsigned int datatype */ +#define uint16_t unsigned short + +/* Have unsigned long datatype */ +#define uint32_t unsigned int + +/* Have unsigned __int64 datatype */ +#define uint64_t unsigned __int64 + +/* Have unsigned char datatype */ +#define uint8_t unsigned char + #if DELAY_POOLS #define STR_DELAY_POOLS "--enable-delay-pools " #else