--------------------- PatchSet 4582 Date: 2002/07/25 12:49:04 Author: rbcollins Branch: autoconf-25 Tag: (none) Log: more type check updates, and typedefs work better with ;'s Members: configure.in:1.61.4.3->1.61.4.4 include/config.h:1.5.42.3->1.5.42.4 lib/MemPool.c:1.6->1.6.14.1 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.61.4.3 retrieving revision 1.61.4.4 diff -u -r1.61.4.3 -r1.61.4.4 --- squid/configure.in 25 Jul 2002 11:55:16 -0000 1.61.4.3 +++ squid/configure.in 25 Jul 2002 12:49:04 -0000 1.61.4.4 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.61.4.3 2002/07/25 11:55:16 rbcollins Exp $ +dnl $Id: configure.in,v 1.61.4.4 2002/07/25 12:49:04 rbcollins Exp $ dnl dnl dnl @@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6-DEVEL-autoconf25) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.61.4.3 $)dnl +AC_REVISION($Revision: 1.61.4.4 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1422,14 +1422,13 @@ ,SQUID_DEFAULT_INCLUDES) AC_CHECK_TYPE(pid_t, AC_DEFINE(HAVE_PID_T,1,[pid_t is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) -AC_CHECK_TYPE(size_t, unsigned int) -AC_CHECK_TYPE(ssize_t, int) -AC_CHECK_TYPE(off_t, int) -AC_CHECK_TYPE(mode_t, unsigned short) -AC_CHECK_TYPE(fd_mask, int) - -AC_CHECK_SIZEOF_SYSTYPE(off_t, 4) -AC_CHECK_SIZEOF_SYSTYPE(size_t, 4) +AC_CHECK_TYPE(size_t, [AC_CHECK_SIZEOF(size_t,,SQUID_DEFAULT_INCLUDES) + AC_DEFINE(HAVE_SIZE_T,1,[size_t is defined by the system headers])],,SQUID_DEFAULT_INCLUDES) +AC_CHECK_TYPE(ssize_t, AC_DEFINE(HAVE_SSIZE_T,1,[ssize_t is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) +AC_CHECK_TYPE(off_t,[ AC_CHECK_SIZEOF(off_t,,SQUID_DEFAULT_INCLUDES) + AC_DEFINE(HAVE_OFF_T,1,[off_t is defined by the system headers])],,SQUID_DEFAULT_INCLUDES) +AC_CHECK_TYPE(mode_t, AC_DEFINE(HAVE_MODE_T,1,[mode_t is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) +AC_CHECK_TYPE(fd_mask, AC_DEFINE(HAVE_FD_MASK,1,[fd_mask is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) dnl Check for special functions AC_FUNC_ALLOCA @@ -1442,17 +1441,9 @@ #include #endif]) -dnl Check for mtyp_t in some headers -AC_CACHE_CHECK(for mtyp_t, ac_cv_type_mtyp_t, [ - AC_EGREP_CPP([mtyp_t[^a-zA-Z_0-9]], [#include +AC_CHECK_TYPE(mtyp_t,AC_DEFINE(HAVE_MTYP_T,1,[mtyp_t is defined by the system headers]),,[#include #include -#include ], - ac_cv_type_mtyp_t=yes, - ac_cv_type_mtyp_t=no) -]) -if test $ac_cv_type_mtyp_t = no; then - AC_DEFINE(mtyp_t, long,[message type for message queues]) - fi +#include ]) dnl Check for needed libraries AC_CHECK_LIB(nsl, main) Index: squid/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/config.h,v retrieving revision 1.5.42.3 retrieving revision 1.5.42.4 diff -u -r1.5.42.3 -r1.5.42.4 --- squid/include/config.h 25 Jul 2002 11:55:16 -0000 1.5.42.3 +++ squid/include/config.h 25 Jul 2002 12:49:04 -0000 1.5.42.4 @@ -129,9 +129,9 @@ /* int16_t */ #ifndef HAVE_INT16_T #if HAVE_SHORT && SIZEOF_SHORT == 2 -typedef short int16_t +typedef short int16_t; #elif HAVE_INT && SIZEOF_INT == 2 -typedef int int16_t +typedef int int16_t; #else #error NO 16 bit signed type available #endif @@ -140,18 +140,18 @@ /* u_int16_t */ #ifndef HAVE_U_INT16_T #if HAVE_UINT16_T -typedef uint16_t u_int16_t +typedef uint16_t u_int16_t; #else -typedef unsigned int16_t u_int16_t +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 +typedef int int32_t; #elif HAVE_LONG && SIZEOF_LONG == 4 -typedef long int32_t +typedef long int32_t; #else #error NO 32 bit signed type available #endif @@ -160,20 +160,20 @@ /* u_int32_t */ #ifndef HAVE_U_INT32_T #if HAVE_UINT32_T -typedef uint32_t u_int32_t +typedef uint32_t u_int32_t; #else -typedef unsigned int32_t u_int32_t +typedef unsigned int32_t u_int32_t; #endif #endif /* int64_t */ #ifndef HAVE_INT64_T #if HAVE___INT64 -typedef __int64 int64_t +typedef __int64 int64_t; #elif HAVE_LONG && SIZEOF_LONG == 8 -typedef long int64_t +typedef long int64_t; #elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 -typedef long long int64_t +typedef long long int64_t; #else #error NO 64 bit signed type available #endif @@ -182,22 +182,43 @@ /* u_int64_t */ #ifndef HAVE_U_INT64_T #if HAVE_UINT64_T -typedef uint64_t u_int64_t +typedef uint64_t u_int64_t; #else -typedef unsigned int64_t u_int64_t +typedef unsigned int64_t u_int64_t; #endif #endif -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t -#endif #ifndef HAVE_PID_T -typedef pid_t int +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 fd_mask -#define fd_mask unsigned long +#ifndef HAVE_MTYP_T +typedef long mtyp_t; #endif #if !defined(CACHEMGR_HOSTNAME) Index: squid/lib/MemPool.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/Attic/MemPool.c,v retrieving revision 1.6 retrieving revision 1.6.14.1 diff -u -r1.6 -r1.6.14.1 --- squid/lib/MemPool.c 16 Apr 2002 01:12:41 -0000 1.6 +++ squid/lib/MemPool.c 25 Jul 2002 12:49:05 -0000 1.6.14.1 @@ -80,12 +80,16 @@ * Andres Kroonmaa. */ +#include "config.h" + +extern void test(); + + #define FLUSH_LIMIT 1000 /* Flush memPool counters to memMeters after flush limit calls */ #define MEM_MAX_MMAP_CHUNKS 2048 #include -#include "config.h" #if HAVE_STRING_H #include #endif