Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 18347 invoked by uid 6000); 4 Nov 1998 22:23:58 -0000 Received: (qmail 18263 invoked by alias); 4 Nov 1998 22:23:51 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 18215 invoked by uid 216); 4 Nov 1998 22:23:47 -0000 Date: 4 Nov 1998 22:23:46 -0000 Message-ID: <19981104222346.18214.qmail@hyperreal.org> From: manoj@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3/src/include ap_config.h Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org manoj 98/11/04 14:23:46 Modified: src CHANGES src/include ap_config.h Log: PR: 3177 Move a typedef to fix compile problems with 1.x kernels. Revision Changes Path 1.1133 +3 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1132 retrieving revision 1.1133 diff -u -u -r1.1132 -r1.1133 --- CHANGES 1998/11/04 12:38:32 1.1132 +++ CHANGES 1998/11/04 22:23:42 1.1133 @@ -1,5 +1,8 @@ Changes with Apache 1.3.4 + *) Move a typedef to fix compile problems on Linux with 1.x kernels. + [Manoj Kasichainula] PR#3177 + *) PORT: Add a port to the Concurrent PowerMAX OS. [Tom Horsley ] 1.242 +5 -5 apache-1.3/src/include/ap_config.h Index: ap_config.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v retrieving revision 1.241 retrieving revision 1.242 diff -u -u -r1.241 -r1.242 --- ap_config.h 1998/10/19 02:16:27 1.241 +++ ap_config.h 1998/11/04 22:23:45 1.242 @@ -436,11 +436,6 @@ #define HAVE_MMAP 1 #define USE_MMAP_FILES -/* glibc 2.1 and later finally define rlim_t */ -#if !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) -typedef int rlim_t; -#endif - /* flock is faster ... but hasn't been tested on 1.x systems */ #define USE_FLOCK_SERIALIZED_ACCEPT @@ -456,6 +451,11 @@ #undef NEED_STRDUP #include #define HAVE_SYSLOG 1 + +/* glibc 2.1 and later finally define rlim_t */ +#if !defined(__GLIBC__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) +typedef int rlim_t; +#endif #elif defined(SCO) #undef HAVE_GMTOFF