From: hno <>
Date: Tue, 29 Apr 2003 22:08:18 +0000 (+0000)
Subject: AIX updated by Gerard Eviston
X-Git-Tag: SQUID_3_0_PRE1~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6e0ad1e10d346349d353786b90ccafba5ff653e;p=thirdparty%2Fsquid.git

AIX updated by Gerard Eviston
---

diff --git a/configure.in b/configure.in
index 48776d02cd..ca787e9473 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.331 2003/04/27 00:18:00 hno Exp $
+dnl  $Id: configure.in,v 1.332 2003/04/29 16:08:18 hno 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-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.331 $)dnl
+AC_REVISION($Revision: 1.332 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1802,13 +1802,17 @@ dnl Please change your configure script.  AIX doesn't need -lbsd.
 	*-ibm-aix*)
 		echo "Removing -lbsd for AIX..."
 		LIBS=`echo $LIBS | sed -e s/-lbsd//`
+		case "$host" in
 dnl From: mlaster@metavillage.com (Mike Laster)
 dnl AIX 4.1.4.x does not have header files for snprintf/vsnprintf
 dnl So using the internal versions generates a load of warnings
 dnl during compile.
-		echo "disabling snprintf/vsnprintf for $host"
-		ac_cv_func_snprintf=no
-		ac_cv_func_vsnprintf=no
+			*-ibm-aix4*)
+				echo "disabling snprintf/vsnprintf for $host"
+				ac_cv_func_snprintf=no
+				ac_cv_func_vsnprintf=no
+			;;
+		esac
 		;;
 	*m88k*)
 		CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
diff --git a/src/tools.cc b/src/tools.cc
index 38d2052723..4c3a938244 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.235 2003/04/24 06:35:09 hno Exp $
+ * $Id: tools.cc,v 1.236 2003/04/29 16:08:19 hno Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -255,6 +255,9 @@ rusage_maxrss(struct rusage *r)
     return r->ru_maxrss;
 #elif defined(_SQUID_OSF_)
 
+    return r->ru_maxrss;
+#elif defined(_SQUID_AIX_)
+
     return r->ru_maxrss;
 #elif defined(BSD4_4)