dgaudet 97/06/30 18:15:30
Modified: src CHANGES Configure conf.h
src/helpers GuessOS
Log:
PR#333: Fix rlim_t problems with AIX 4.2.
Submitted by: Marc Slemko
Reviewed by: Dean Gaudet
Revision Changes Path
1.318 +2 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.317
retrieving revision 1.318
diff -C3 -r1.317 -r1.318
*** CHANGES 1997/07/01 01:13:40 1.317
--- CHANGES 1997/07/01 01:15:26 1.318
***************
*** 145,150 ****
--- 145,152 ----
*) 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.104 +7 -3 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.103
retrieving revision 1.104
diff -C3 -r1.103 -r1.104
*** Configure 1997/06/30 21:42:30 1.103
--- Configure 1997/07/01 01:15:27 1.104
***************
*** 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.109 +2 -0 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -C3 -r1.108 -r1.109
*** conf.h 1997/06/30 21:03:17 1.108
--- conf.h 1997/07/01 01:15:27 1.109
***************
*** 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
1.24 +1 -1 apache/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** GuessOS 1997/06/24 01:10:58 1.23
--- GuessOS 1997/07/01 01:15:30 1.24
***************
*** 61,67 ****
;;
AIX:*)
! echo "${MACHINE}-ibm-aix"; exit 0
;;
dgux:*)
--- 61,67 ----
;;
AIX:*)
! echo "${MACHINE}-ibm-aix${VERSION}.${RELEASE}"; exit 0
;;
dgux:*)
