--------------------- PatchSet 9178 Date: 2009/08/22 16:40:11 Author: serassio Branch: nt Tag: (none) Log: Moved type definitons from config.h to squid_types.h Members: compat/os/mswin.h:1.1.2.4->1.1.2.5 include/config.h:1.3.16.20->1.3.16.21 include/squid_types.h:1.1.2.5->1.1.2.6 Index: squid3/compat/os/mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/compat/os/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/compat/os/mswin.h 1 Jun 2009 08:31:34 -0000 1.1.2.4 +++ squid3/compat/os/mswin.h 22 Aug 2009 16:40:11 -0000 1.1.2.5 @@ -1,5 +1,5 @@ /* - * $Id: mswin.h,v 1.1.2.4 2009/06/01 08:31:34 serassio Exp $ + * $Id: mswin.h,v 1.1.2.5 2009/08/22 16:40:11 serassio Exp $ * * AUTHOR: Andrey Shorin * AUTHOR: Guido Serassio @@ -68,15 +68,15 @@ typedef unsigned int uint32_t; typedef unsigned __int64 uint64_t; -typedef long pid_t; +/* typedef long pid_t; */ #if defined __USE_FILE_OFFSET64 typedef int64_t off_t; -typedef uint64_t ino_t; +// typedef uint64_t ino_t; #else typedef long off_t; -typedef unsigned long ino_t; +// typedef unsigned long ino_t; #endif Index: squid3/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/config.h,v retrieving revision 1.3.16.20 retrieving revision 1.3.16.21 diff -u -r1.3.16.20 -r1.3.16.21 --- squid3/include/config.h 4 Mar 2009 14:08:15 -0000 1.3.16.20 +++ squid3/include/config.h 22 Aug 2009 16:40:28 -0000 1.3.16.21 @@ -1,5 +1,5 @@ /* - * $Id: config.h,v 1.3.16.20 2009/03/04 14:08:15 serassio Exp $ + * $Id: config.h,v 1.3.16.21 2009/08/22 16:40:28 serassio Exp $ * * AUTHOR: Duane Wessels * @@ -59,126 +59,10 @@ #ifdef USE_POSIX_REGEX #ifndef USE_RE_SYNTAX -#define USE_RE_SYNTAX REG_EXTENDED /* default Syntax */ +#define USE_RE_SYNTAX REG_EXTENDED /* default Syntax */ #endif #endif - -/* Typedefs for missing entries on a system */ - -/* int8_t */ -#ifndef HAVE_INT8_T -#if HAVE_CHAR && SIZEOF_CHAR == 1 -typedef char int8_t; -#else -#error NO 8 bit signed type available -#endif -#endif - -/* u_int8_t */ -#ifndef HAVE_U_INT8_T -#if HAVE_UINT8_T -typedef uint8_t u_int8_t; -#else -typedef unsigned char u_int8_t; -#endif -#endif - -/* int16_t */ -#ifndef HAVE_INT16_T -#if HAVE_SHORT && SIZEOF_SHORT == 2 -typedef short int16_t; -#elif HAVE_INT && SIZEOF_INT == 2 -typedef int int16_t; -#else -#error NO 16 bit signed type available -#endif -#endif - -/* u_int16_t */ -#ifndef HAVE_U_INT16_T -#if HAVE_UINT16_T -typedef uint16_t u_int16_t; -#else -typedef unsigned int16_t u_int16_t; -#endif -#endif - -/* int32_t */ -#ifndef HAVE_INT32_T -#if HAVE_INT && SIZEOF_INT == 4 -typedef int int32_t; -#elif HAVE_LONG && SIZEOF_LONG == 4 -typedef long int32_t; -#else -#error NO 32 bit signed type available -#endif -#endif - -/* u_int32_t */ -#ifndef HAVE_U_INT32_T -#if HAVE_UINT32_T -typedef uint32_t u_int32_t; -#else -typedef unsigned int32_t u_int32_t; -#endif -#endif - -/* int64_t */ -#ifndef HAVE_INT64_T -#if HAVE___INT64 -typedef __int64 int64_t; -#elif HAVE_LONG && SIZEOF_LONG == 8 -typedef long int64_t; -#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 -typedef long long int64_t; -#else -#error NO 64 bit signed type available -#endif -#endif - -/* u_int64_t */ -#ifndef HAVE_U_INT64_T -#if HAVE_UINT64_T -typedef uint64_t u_int64_t; -#else -typedef unsigned int64_t u_int64_t; -#endif -#endif - - -#ifndef HAVE_PID_T -typedef int pid_t; -#endif - -#ifndef HAVE_SIZE_T -typedef unsigned int size_t; -#endif - -#ifndef HAVE_SSIZE_T -typedef int ssize_t; -#endif - -#ifndef HAVE_OFF_T -typedef int off_t; -#endif - -#ifndef HAVE_MODE_T -typedef unsigned short mode_t; -#endif - -#ifndef HAVE_FD_MASK -typedef unsigned long fd_mask; -#endif - -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif - -#ifndef HAVE_MTYP_T -typedef long mtyp_t; -#endif - #if !defined(CACHEMGR_HOSTNAME) #define CACHEMGR_HOSTNAME "" #else Index: squid3/include/squid_types.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/squid_types.h,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid3/include/squid_types.h 14 Aug 2009 07:28:48 -0000 1.1.2.5 +++ squid3/include/squid_types.h 22 Aug 2009 16:40:28 -0000 1.1.2.6 @@ -1,5 +1,5 @@ /* - * $Id: squid_types.h,v 1.1.2.5 2009/08/14 07:28:48 serassio Exp $ + * $Id: squid_types.h,v 1.1.2.6 2009/08/22 16:40:28 serassio Exp $ * * * * * * * * * Legal stuff * * * * * * * * @@ -81,6 +81,147 @@ #include #endif + +/* Typedefs for missing entries on a system */ + +/* int8_t */ +#ifndef HAVE_INT8_T +#if HAVE_CHAR && SIZEOF_CHAR == 1 +typedef char int8_t; +#else +#error NO 8 bit signed type available +#endif +#endif + +/* u_int8_t */ +#ifndef HAVE_U_INT8_T +#if HAVE_UINT8_T +typedef uint8_t u_int8_t; +#else +typedef unsigned char u_int8_t; +#endif +#endif + +/* int16_t */ +#ifndef HAVE_INT16_T +#if HAVE_SHORT && SIZEOF_SHORT == 2 +typedef short int16_t; +#elif HAVE_INT && SIZEOF_INT == 2 +typedef int int16_t; +#else +#error NO 16 bit signed type available +#endif +#endif + +/* u_int16_t */ +#ifndef HAVE_U_INT16_T +#if HAVE_UINT16_T +typedef uint16_t u_int16_t; +#else +#ifndef HAVE_INT16_T +#if HAVE_SHORT && SIZEOF_SHORT == 2 +typedef unsigned short u_int16_t; +#elif HAVE_INT && SIZEOF_INT == 2 +typedef unsigned int u_int16_t; +#else +typedef unsigned int16_t u_int16_t; +#endif +#endif /* HAVE_INT16_T */ +#endif /* HAVE_UINT16_T */ +#endif /* HAVE_U_INT16_T */ + +/* int32_t */ +#ifndef HAVE_INT32_T +#if HAVE_INT && SIZEOF_INT == 4 +typedef int int32_t; +#elif HAVE_LONG && SIZEOF_LONG == 4 +typedef long int32_t; +#else +#error NO 32 bit signed type available +#endif +#endif + +/* u_int32_t */ +#ifndef HAVE_U_INT32_T +#if HAVE_UINT32_T +typedef uint32_t u_int32_t; +#else +#ifndef HAVE_INT32_T +#if HAVE_INT && SIZEOF_INT == 4 +typedef unsigned int u_int32_t; +#elif HAVE_LONG && SIZEOF_LONG == 4 +typedef unsigned long u_int32_t; +#else +typedef unsigned int32_t u_int32_t; +#endif +#endif +#endif +#endif + +/* int64_t */ +#ifndef HAVE_INT64_T +#if HAVE___INT64 +typedef __int64 int64_t; +#elif HAVE_LONG && SIZEOF_LONG == 8 +typedef long int64_t; +#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 +typedef long long int64_t; +#else +#error NO 64 bit signed type available +#endif +#endif + +/* u_int64_t */ +#ifndef HAVE_U_INT64_T +#if HAVE_UINT64_T +typedef uint64_t u_int64_t; +#else +#ifndef HAVE_INT64_T +#if HAVE___INT64 +typedef unsigned __int64 u_int64_t; +#elif HAVE_LONG && SIZEOF_LONG == 8 +typedef unsigned long u_int64_t; +#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 +typedef unsigned long long u_int64_t; +#else +typedef unsigned int64_t u_int64_t; +#endif +#endif +#endif +#endif + +#ifndef HAVE_PID_T +typedef int pid_t; +#endif + +#ifndef HAVE_SIZE_T +typedef unsigned int size_t; +#endif + +#ifndef HAVE_SSIZE_T +typedef int ssize_t; +#endif + +#ifndef HAVE_OFF_T +typedef int off_t; +#endif + +#ifndef HAVE_MODE_T +typedef unsigned short mode_t; +#endif + +#ifndef HAVE_FD_MASK +typedef unsigned long fd_mask; +#endif + +#ifndef HAVE_SOCKLEN_T +typedef int socklen_t; +#endif + +#ifndef HAVE_MTYP_T +typedef long mtyp_t; +#endif + /* * ISO C99 Standard printf() macros for 64 bit integers * On some 64 bit platform, HP Tru64 is one, for printf must be used