From: serassio <>
Date: Sun, 7 Aug 2005 18:16:50 +0000 (+0000)
Subject: Allow build on Solaris x86 with both fixed or not fixed includes.
X-Git-Tag: SQUID_3_0_PRE4~691
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=588e71df9f9648e7c0e2eae9840da01eefbd9118;p=thirdparty%2Fsquid.git

Allow build on Solaris x86 with both fixed or not fixed includes.

For more details:
http://www.squid-cache.org/mail-archive/squid-dev/200507/0045.html
http://forum.sun.com/thread.jspa?threadID=20228&tstart=105
---

diff --git a/configure.in b/configure.in
index 6e650d5166..379e656812 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.381 2005/08/05 16:12:35 hno Exp $
+dnl  $Id: configure.in,v 1.382 2005/08/07 12:16:50 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.381 $)dnl
+AC_REVISION($Revision: 1.382 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1885,6 +1885,17 @@ AC_CHECK_TYPE(uint64_t,
   AC_DEFINE(HAVE_UINT64_T,1,[uint64_t is defined in system headers]),
   ,SQUID_DEFAULT_INCLUDES)
 
+dnl On Solaris 9 x86, gcc may includes a "fixed" set of old system include files
+dnl that is incompatible with the updated Solaris header files.
+dnl For this reason, we must check if pad128_t and upad128_t are defined.
+AC_CHECK_TYPE(pad128_t,
+  AC_DEFINE(HAVE_PAD128_T,1,[pad128_t is defined in system headers]),
+  ,SQUID_DEFAULT_INCLUDES)
+
+AC_CHECK_TYPE(upad128_t,
+  AC_DEFINE(HAVE_UPAD128_T,1,[upad128_t is defined in system headers]),
+  ,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, [AC_CHECK_SIZEOF(size_t,,SQUID_DEFAULT_SIZEOF_INCLUDES)
   AC_DEFINE(HAVE_SIZE_T,1,[size_t is defined by the system headers])],,SQUID_DEFAULT_INCLUDES)
diff --git a/include/config.h b/include/config.h
index 93834f599a..0e6721dfc4 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,5 +1,5 @@
 /*
- * $Id: config.h,v 1.18 2005/04/23 20:40:50 serassio Exp $
+ * $Id: config.h,v 1.19 2005/08/07 12:16:51 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -309,13 +309,13 @@ typedef long mtyp_t;
  * that is incompatible with the updated Solaris header files.
  */
 #if defined(_SQUID_SOLARIS_) && (defined(i386) || defined(__i386))
-#ifndef pad128_t
+#ifndef HAVE_PAD128_T
 typedef union {
 	long double	_q;
 	int32_t		_l[4];
 } pad128_t;
 #endif
-#ifndef upda128_t
+#ifndef HAVE_UPAD128_T
 typedef union {
 	long double	_q;
 	uint32_t	_l[4];