Commit 5ab53be3 authored by dgaudet's avatar dgaudet
Browse files

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
parent 12bdf398

APACHE_1_2_X/src/CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -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

APACHE_1_2_X/src/Configure

+7 −3
Original line number Diff line number Diff line
@@ -205,8 +205,12 @@ 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'

        OS='IBM AIX >= 4.2'

        CFLAGS="$CFLAGS -DAIX -U__STR__"

        ;;

    *-apollo-*)

APACHE_1_2_X/src/helpers/GuessOS

+1 −1
Original line number Diff line number Diff line
@@ -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:*)

APACHE_1_2_X/src/include/ap_config.h

+2 −0
Original line number Diff line number Diff line
@@ -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

APACHE_1_2_X/src/include/conf.h

+2 −0
Original line number Diff line number Diff line
@@ -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