squid-2.5.STABLE2-aix5.patch

   1 Index: squid/configure.in
   2 diff -c squid/configure.in:1.251.2.45 squid/configure.in:1.251.2.46
   3 *** squid/configure.in:1.251.2.45       Mon Mar 17 11:46:45 2003
   4 --- squid/configure.in  Tue Apr 29 10:09:38 2003
   5 ***************
   6 *** 1573,1585 ****
   7         *-ibm-aix*)
   8                 echo "Removing -lbsd for AIX..."
   9                 LIBS=`echo $LIBS | sed -e s/-lbsd//`
  10   dnl From: mlaster@metavillage.com (Mike Laster)
  11   dnl AIX 4.1.4.x does not have header files for snprintf/vsnprintf
  12   dnl So using the internal versions generates a load of warnings
  13   dnl during compile.
  14 !               echo "disabling snprintf/vsnprintf for $host"
  15 !               ac_cv_func_snprintf=no
  16 !               ac_cv_func_vsnprintf=no
  17                 ;;
  18         *m88k*)
  19                 CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
  20 --- 1573,1589 ----
  21         *-ibm-aix*)
  22                 echo "Removing -lbsd for AIX..."
  23                 LIBS=`echo $LIBS | sed -e s/-lbsd//`
  24 +               case "$host" in
  25   dnl From: mlaster@metavillage.com (Mike Laster)
  26   dnl AIX 4.1.4.x does not have header files for snprintf/vsnprintf
  27   dnl So using the internal versions generates a load of warnings
  28   dnl during compile.
  29 !                       *-ibm-aix4*)
  30 !                               echo "disabling snprintf/vsnprintf for $host"
  31 !                               ac_cv_func_snprintf=no
  32 !                               ac_cv_func_vsnprintf=no
  33 !                       ;;
  34 !               esac
  35                 ;;
  36         *m88k*)
  37                 CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
  38 Index: squid/src/tools.c
  39 diff -c squid/src/tools.c:1.213.2.5 squid/src/tools.c:1.213.2.6
  40 *** squid/src/tools.c:1.213.2.5 Fri Feb  7 19:31:10 2003
  41 --- squid/src/tools.c   Tue Apr 29 10:09:40 2003
  42 ***************
  43 *** 206,211 ****
  44 --- 206,213 ----
  45       return r->ru_maxrss;
  46   #elif defined(_SQUID_OSF_)
  47       return r->ru_maxrss;
  48 + #elif defined(_SQUID_AIX_)
  49 +     return r->ru_maxrss;
  50   #elif defined(BSD4_4)
  51       return r->ru_maxrss;
  52   #elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
  53 Index: squid/configure
  54 diff -c squid/configure:1.248.2.47 squid/configure:1.248.2.48
  55 *** squid/configure:1.248.2.47  Mon Mar 17 11:49:18 2003
  56 --- squid/configure     Tue Apr 29 10:16:11 2003
  57 ***************
  58 *** 7293,7301 ****
  59         *-ibm-aix*)
  60                 echo "Removing -lbsd for AIX..."
  61                 LIBS=`echo $LIBS | sed -e s/-lbsd//`
  62 !               echo "disabling snprintf/vsnprintf for $host"
  63 !               ac_cv_func_snprintf=no
  64 !               ac_cv_func_vsnprintf=no
  65                 ;;
  66         *m88k*)
  67                 CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
  68 --- 7293,7305 ----
  69         *-ibm-aix*)
  70                 echo "Removing -lbsd for AIX..."
  71                 LIBS=`echo $LIBS | sed -e s/-lbsd//`
  72 !               case "$host" in
  73 !                       *-ibm-aix4*)
  74 !                               echo "disabling snprintf/vsnprintf for $host"
  75 !                               ac_cv_func_snprintf=no
  76 !                               ac_cv_func_vsnprintf=no
  77 !                       ;;
  78 !               esac
  79                 ;;
  80         *m88k*)
  81                 CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"