---------------------
PatchSet 6505 
Date: 2005/03/13 01:16:42
Author: hno
Branch: lfs-2_5
Tag: (none) 
Log:
Be a bit more conservative when support for 64-bit types is enabled on
32-bit platforms

Members: 
	configure.in:1.42.2.59.2.2->1.42.2.59.2.3 
	src/squid.h:1.13.6.7.8.4->1.13.6.7.8.5 
	src/typedefs.h:1.25.6.6.8.6->1.25.6.6.8.7 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.59.2.2
retrieving revision 1.42.2.59.2.3
diff -u -r1.42.2.59.2.2 -r1.42.2.59.2.3
--- squid/configure.in	12 Mar 2005 01:31:45 -0000	1.42.2.59.2.2
+++ squid/configure.in	13 Mar 2005 01:16:42 -0000	1.42.2.59.2.3
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.42.2.59.2.2 2005/03/12 01:31:45 hno Exp $
+dnl  $Id: configure.in,v 1.42.2.59.2.3 2005/03/13 01:16:42 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE9-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.42.2.59.2.2 $)dnl
+AC_REVISION($Revision: 1.42.2.59.2.3 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1762,6 +1762,7 @@
 	srand48 \
 	srandom \
 	statfs \
+	strtoll \
 	sysconf \
 	syslog \
 	timegm \
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.13.6.7.8.4
retrieving revision 1.13.6.7.8.5
diff -u -r1.13.6.7.8.4 -r1.13.6.7.8.5
--- squid/src/squid.h	11 Mar 2005 23:54:34 -0000	1.13.6.7.8.4
+++ squid/src/squid.h	13 Mar 2005 01:16:47 -0000	1.13.6.7.8.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.13.6.7.8.4 2005/03/11 23:54:34 hno Exp $
+ * $Id: squid.h,v 1.13.6.7.8.5 2005/03/13 01:16:47 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -481,4 +481,12 @@
 #define FD_READ_METHOD(fd, buf, len) (*fd_table[fd].read_method)(fd, buf, len)
 #define FD_WRITE_METHOD(fd, buf, len) (*fd_table[fd].write_method)(fd, buf, len)
 
+/*
+ * Trap attempts to build large file cache support without support for
+ * large objects
+ */
+#if LARGE_CACHE_FILES && SIZEOF_SQUID_OFF_T <= 4
+#  error Your platform does not support large integers. Can not build with --enable-large-cache-files
+#endif
+
 #endif /* SQUID_H */
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.25.6.6.8.6
retrieving revision 1.25.6.6.8.7
diff -u -r1.25.6.6.8.6 -r1.25.6.6.8.7
--- squid/src/typedefs.h	12 Mar 2005 01:32:14 -0000	1.25.6.6.8.6
+++ squid/src/typedefs.h	13 Mar 2005 01:16:48 -0000	1.25.6.6.8.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.25.6.6.8.6 2005/03/12 01:32:14 hno Exp $
+ * $Id: typedefs.h,v 1.25.6.6.8.7 2005/03/13 01:16:48 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -41,16 +41,16 @@
 typedef signed int sfileno;
 typedef signed int sdirno;
 
-#if SIZEOF_LONG_LONG > SIZEOF_LONG
-typedef long long squid_off_t;
-#define SIZEOF_SQUID_OFF_T SIZEOF_LONG_LONG
-#define PRINTF_OFF_T "lld"
-#define strto_off_t strtoll
+#if SIZEOF_INT64_T > SIZEOF_LONG && defined(PRId64) && defined(INT64_MAX) && HAVE_STRTOLL
+typedef int64_t squid_off_t;
+#  define SIZEOF_SQUID_OFF_T SIZEOF_INT64_T
+#  define PRINTF_OFF_T PRId64
+#  define strto_off_t (int64_t)strtoll
 #else
 typedef long squid_off_t;
-#define SIZEOF_SQUID_OFF_T SIZEOF_LONG
-#define PRINTF_OFF_T "ld"
-#define strto_off_t strtol
+#  define SIZEOF_SQUID_OFF_T SIZEOF_LONG
+#  define PRINTF_OFF_T "ld"
+#  define strto_off_t strtol
 #endif
 
 #if LARGE_CACHE_FILES