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 da3a0c2b6ce4815dfdfd4e75b00458eb4763fcb9..a539ea6cb378fd92f38def824472ca40b38de02b 100644 (file)
--- 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 8081904c3ef4058ccd32a79216a933a6f720e063..41f08ad112eba77abd794ab5106908840d35f203 100755 (executable)
--- 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 25a235857c7b0f73eacd851e578d4a25d1971c43..70d315ac9175b378eda8c5ddbc6ec28159dce2dd 100755 (executable)
--- 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 1ddc9fdc77b04c78f6d6636292ec2268ccadb442..af95640b267d6b4f5ecf6c8e8e04f098d8d5e5f1 100644 (file)
--- 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 1ddc9fdc77b04c78f6d6636292ec2268ccadb442..af95640b267d6b4f5ecf6c8e8e04f098d8d5e5f1 100644 (file)
--- 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