You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/05/06 18:09:11 UTC
cvs commit: apache-2.0/src/os/win32 os.h
wrowe 00/05/06 09:09:11
Modified: src/lib/pcre dftables.dsp pcre.dsp pcreposix.dsp
src/os/win32 os.h
Log:
pcre lives and dies on the _WIN32 define, rather than WIN32...
Adjusted os/win32/os.h to always declare _WIN32, and fixed up
some goodies. Win32 now serves pages.
Revision Changes Path
1.3 +1 -1 apache-2.0/src/lib/pcre/dftables.dsp
Index: dftables.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/pcre/dftables.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dftables.dsp 2000/05/06 15:44:39 1.2
+++ dftables.dsp 2000/05/06 16:09:09 1.3
@@ -66,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
1.3 +2 -2 apache-2.0/src/lib/pcre/pcre.dsp
Index: pcre.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/pcre/pcre.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcre.dsp 2000/05/06 15:44:39 1.2
+++ pcre.dsp 2000/05/06 16:09:09 1.3
@@ -39,7 +39,7 @@
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -60,7 +60,7 @@
# PROP Intermediate_Dir "LibD"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
1.3 +2 -2 apache-2.0/src/lib/pcre/pcreposix.dsp
Index: pcreposix.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/pcre/pcreposix.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcreposix.dsp 2000/05/06 15:44:39 1.2
+++ pcreposix.dsp 2000/05/06 16:09:10 1.3
@@ -39,7 +39,7 @@
# PROP Intermediate_Dir "LibR/posix"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -60,7 +60,7 @@
# PROP Intermediate_Dir "LibD/posix"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
1.25 +5 -0 apache-2.0/src/os/win32/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- os.h 2000/05/01 14:40:03 1.24
+++ os.h 2000/05/06 16:09:10 1.25
@@ -68,6 +68,11 @@
* are required (for a window rather than console application), include
* windows.h prior to any other Apache header files.
*/
+
+#ifndef _WIN32
+#define _WIN32
+#endif
+
#include "apr_general.h"
#include <process.h>
#include <malloc.h>