Bug #767: Problem making Squid 3.0 PRE3 64 bit

Final fix for %llu problem on HP Tru64.

diff --git a/src/squid.h b/src/squid.h
index 1f1928fba4977a4f43df24f581049dc352aecb5d..359d1dbf05b40915bdb7241eee02bd72b6d14457 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.250 2006/04/23 09:02:13 serassio Exp $
+ * $Id: squid.h,v 1.251 2006/05/07 15:18:39 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -458,14 +458,10 @@ void free(V x) { fatal("Do not use ::free()"); }
 #ifndef PRIu64 /* ISO C99 Standard printf() macro for 64 bit unsigned int */
 #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
 #define PRIu64 "I64u"
-/* FIXME: Temporary hack to allow the build on Digital/Compaq/HP Tru64 Unix.
-   Long term solution: add type size detect in configure like Squid 2.5 and
-   define PRIu64 according to the size of long int and int64_t.      
- */
-#elif defined(__alpha) && defined(_SQUID_OSF_)
-#define PRIu64 "lu"
-#else
+#elif SIZEOF_INT64_T > SIZEOF_LONG
 #define PRIu64 "llu"
+#else
+#define PRIu64 "lu"
 #endif /* _SQUID_MSWIN_ */
 #endif /* PRIu64 */