From: dgaudet <dgaudet@unknown>
Date: Tue, 1 Jul 1997 01:38:16 +0000 (+0000)
Subject: PR#333: Fix rlim_t problems with AIX 4.2.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f22dc738dae96bbd9eb875056d7800c236fabd32;p=thirdparty%2Fapache%2Fhttpd.git

PR#333: Fix rlim_t problems with AIX 4.2.

Submitted by: Marc Slemko
Reviewed by:  Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78484 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index da3a0c2b6ce..a539ea6cb37 100644
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -82,6 +82,8 @@ Changes with Apache 1.2.1
 
   *) pregsub had an off-by-1 in its error checking code. [Alexei Kosut]
 
+  *) PORT: fix rlim_t problems with AIX 4.2. [Marc Slemko] PR#333
+
   *) PORT: Update Unixware support for 2.1.2.
      [Lawrence Rosenman <ler@lerctr.org>] PR#511
 
diff --git a/APACHE_1_2_X/src/Configure b/APACHE_1_2_X/src/Configure
index 8081904c3ef..41f08ad112e 100755
--- a/APACHE_1_2_X/src/Configure
+++ b/APACHE_1_2_X/src/Configure
@@ -205,10 +205,14 @@ case "$PLAT" in
 	CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
 	DEF_WANTHSREGEX=no
 	;;
+    *-ibm-aix[1-3].*|*-ibm-aix4.[0-1])
+        OS='IBM AIX < v4.2'
+        CFLAGS="$CFLAGS -DAIX -DNEED_RLIM_T -U__STR__"
+        ;;
     *-ibm-aix*)
-	OS='IBM AIX'
-	CFLAGS="$CFLAGS -DAIX -U__STR__"
-	;;
+        OS='IBM AIX >= 4.2'
+        CFLAGS="$CFLAGS -DAIX -U__STR__"
+        ;;
     *-apollo-*)
 	OS='Apollo Domain'
 	CFLAGS="$CFLAGS -DAPOLLO"
diff --git a/APACHE_1_2_X/src/helpers/GuessOS b/APACHE_1_2_X/src/helpers/GuessOS
index 25a235857c7..70d315ac917 100755
--- a/APACHE_1_2_X/src/helpers/GuessOS
+++ b/APACHE_1_2_X/src/helpers/GuessOS
@@ -61,7 +61,7 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 	;;
 
     AIX:*)
-	echo "${MACHINE}-ibm-aix"; exit 0
+	echo "${MACHINE}-ibm-aix${VERSION}.${RELEASE}"; exit 0
 	;;
 
     dgux:*)
diff --git a/APACHE_1_2_X/src/include/ap_config.h b/APACHE_1_2_X/src/include/ap_config.h
index 1ddc9fdc77b..af95640b267 100644
--- a/APACHE_1_2_X/src/include/ap_config.h
+++ b/APACHE_1_2_X/src/include/ap_config.h
@@ -155,7 +155,9 @@ typedef int rlim_t;
 #define DEFAULT_GROUP "nobody"
 #endif
 #define DEFAULT_USER "nobody"
+#ifdef NEED_RLIM_T
 typedef int rlim_t;
+#endif
 
 #elif defined(ULTRIX)
 #define HAVE_GMTOFF
diff --git a/APACHE_1_2_X/src/include/conf.h b/APACHE_1_2_X/src/include/conf.h
index 1ddc9fdc77b..af95640b267 100644
--- a/APACHE_1_2_X/src/include/conf.h
+++ b/APACHE_1_2_X/src/include/conf.h
@@ -155,7 +155,9 @@ typedef int rlim_t;
 #define DEFAULT_GROUP "nobody"
 #endif
 #define DEFAULT_USER "nobody"
+#ifdef NEED_RLIM_T
 typedef int rlim_t;
+#endif
 
 #elif defined(ULTRIX)
 #define HAVE_GMTOFF