dgaudet 97/06/30 18:38:17
Modified: src Tag: APACHE_1_2_X CHANGES Configure conf.h
src/helpers Tag: APACHE_1_2_X GuessOS
Log:
PR#333: Fix rlim_t problems with AIX 4.2.
Submitted by: Marc Slemko
Reviewed by: Dean Gaudet
Revision Changes Path
No revision
No revision
1.286.2.24 +2 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.23
retrieving revision 1.286.2.24
diff -C3 -r1.286.2.23 -r1.286.2.24
*** CHANGES 1997/07/01 01:37:07 1.286.2.23
--- CHANGES 1997/07/01 01:38:12 1.286.2.24
***************
*** 82,87 ****
--- 82,89 ----
*) 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
1.96.2.7 +7 -3 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.96.2.6
retrieving revision 1.96.2.7
diff -C3 -r1.96.2.6 -r1.96.2.7
*** Configure 1997/06/29 18:28:24 1.96.2.6
--- Configure 1997/07/01 01:38:13 1.96.2.7
***************
*** 205,214 ****
CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
*-ibm-aix*)
! OS='IBM AIX'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
--- 205,218 ----
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 >= 4.2'
! CFLAGS="$CFLAGS -DAIX -U__STR__"
! ;;
*-apollo-*)
OS='Apollo Domain'
CFLAGS="$CFLAGS -DAPOLLO"
1.99.2.4 +2 -0 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.99.2.3
retrieving revision 1.99.2.4
diff -C3 -r1.99.2.3 -r1.99.2.4
*** conf.h 1997/06/29 18:08:35 1.99.2.3
--- conf.h 1997/07/01 01:38:13 1.99.2.4
***************
*** 155,161 ****
--- 155,163 ----
#define DEFAULT_GROUP "nobody"
#endif
#define DEFAULT_USER "nobody"
+ #ifdef NEED_RLIM_T
typedef int rlim_t;
+ #endif
#elif defined(ULTRIX)
#define HAVE_GMTOFF
No revision
No revision
1.19.2.5 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -C3 -r1.19.2.4 -r1.19.2.5
*** GuessOS 1997/06/27 02:02:01 1.19.2.4
--- GuessOS 1997/07/01 01:38:16 1.19.2.5
***************
*** 61,67 ****
;;
AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
;;
dgux:*)
--- 61,67 ----
;;
AIX:*)
! echo "${MACHINE}-ibm-aix${VERSION}.${RELEASE}"; exit 0
;;
dgux:*)
