Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 20945 invoked by uid 6000); 12 Jul 1998 09:07:42 -0000 Received: (qmail 20938 invoked by alias); 12 Jul 1998 09:07:40 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 20935 invoked by uid 168); 12 Jul 1998 09:07:39 -0000 Date: 12 Jul 1998 09:07:39 -0000 Message-ID: <19980712090739.20934.qmail@hyperreal.org> From: rse@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3/src/os/win32 os.h Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org rse 98/07/12 02:07:38 Modified: src/include conf.h src/os/bs2000 os.h src/os/emx os.h src/os/unix os.h src/os/win32 os.h Log: Make sure conf_auto.h is only included when available/generated. At least under the Win32 environment it is not available. Revision Changes Path 1.222 +4 -2 apache-1.3/src/include/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- conf.h 1998/07/11 10:24:08 1.221 +++ conf.h 1998/07/12 09:07:31 1.222 @@ -67,8 +67,6 @@ * See PORTING for a listing of what they mean */ -#include "conf_auto.h" - /* Have to include sys/stat.h before ../os/win32/os.h so we can override stat() properly */ #include @@ -80,6 +78,10 @@ #include "../os/win32/os.h" #else #include "os.h" +#endif + +#ifdef HAVE_CONF_AUTO_H +#include "conf_auto.h" #endif #if !defined(QNX) && !defined(MPE) && !defined(WIN32) 1.9 +1 -0 apache-1.3/src/os/bs2000/os.h Index: os.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/os.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- os.h 1998/05/07 12:24:27 1.8 +++ os.h 1998/07/12 09:07:33 1.9 @@ -9,6 +9,7 @@ * and prototypes of OS specific functions defined in os.c or os-inline.c */ +#define HAVE_CONF_AUTO_H 1 #include "conf.h" #if !defined(INLINE) && defined(USE_GNU_INLINE) 1.6 +2 -0 apache-1.3/src/os/emx/os.h Index: os.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/os/emx/os.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- os.h 1998/05/07 12:24:28 1.5 +++ os.h 1998/07/12 09:07:34 1.6 @@ -9,6 +9,8 @@ * and prototypes of OS specific functions defined in os.c or os-inline.c */ +#define HAVE_CONF_AUTO_H 1 + #if defined(__GNUC__) && !defined(INLINE) /* Compiler supports inline, so include the inlineable functions as * part of the header 1.28 +1 -0 apache-1.3/src/os/unix/os.h Index: os.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/os/unix/os.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- os.h 1998/07/11 10:24:11 1.27 +++ os.h 1998/07/12 09:07:35 1.28 @@ -58,6 +58,7 @@ #ifndef APACHE_OS_H #define APACHE_OS_H +#define HAVE_CONF_AUTO_H 1 #include "conf.h" #define PLATFORM "Unix" 1.21 +5 -0 apache-1.3/src/os/win32/os.h Index: os.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/os/win32/os.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- os.h 1998/07/11 10:24:11 1.20 +++ os.h 1998/07/12 09:07:36 1.21 @@ -9,6 +9,11 @@ * and prototypes of OS specific functions defined in os.c */ +/* under WIN32 we have no conf_auto.h */ +#undef HAVE_CONF_AUTO_H +/* but we provide some entries manually */ +#undef HAVE_UNISTD_H + /* temporarily replace crypt */ /* char *crypt(const char *pw, const char *salt); */ #define crypt(buf,salt) (buf)