rse 98/07/13 02:57:26
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:
The idea with HAVE_CONF_AUTO_H conflicts with the os-stuff, so we really have
to do a direct WIN32 check inside conf.h. Now it should be correct for both
WIN32 and non-WIN32 environments. Thanks to Doug for discovering it and Marc
and Jim for hints.
Revision Changes Path
1.224 +10 -4 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.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- conf.h 1998/07/12 14:38:03 1.223
+++ conf.h 1998/07/13 09:57:22 1.224
@@ -67,6 +67,16 @@
* See PORTING for a listing of what they mean
*/
+/*
+ * Support for platform dependent autogenerated defines
+ */
+#ifndef WIN32
+#include "conf_auto.h"
+#else
+/* not available under WIN32, so provide important entries manually */
+#undef HAVE_UNISTD_H
+#endif
+
/* Have to include sys/stat.h before ../os/win32/os.h so we can override
stat() properly */
#include <sys/types.h>
@@ -78,10 +88,6 @@
#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.10 +0 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- os.h 1998/07/12 09:07:33 1.9
+++ os.h 1998/07/13 09:57:23 1.10
@@ -9,7 +9,6 @@
* 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.7 +0 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- os.h 1998/07/12 09:07:34 1.6
+++ os.h 1998/07/13 09:57:24 1.7
@@ -9,8 +9,6 @@
* 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.29 +0 -1 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- os.h 1998/07/12 09:07:35 1.28
+++ os.h 1998/07/13 09:57:25 1.29
@@ -58,7 +58,6 @@
#ifndef APACHE_OS_H
#define APACHE_OS_H
-#define HAVE_CONF_AUTO_H 1
#include "conf.h"
#define PLATFORM "Unix"
1.22 +0 -5 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- os.h 1998/07/12 09:07:36 1.21
+++ os.h 1998/07/13 09:57:25 1.22
@@ -9,11 +9,6 @@
* 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)
