- Make Win32 compile again

diff --git a/ext/ereg/regex/regex_extra.h b/ext/ereg/regex/regex_extra.h
index b839ddc2ad8f12f44145a3ab79b266d1e3e58def..511df57f675b689d0a98ba2036990940e5b8a66b 100644 (file)
--- a/ext/ereg/regex/regex_extra.h
+++ b/ext/ereg/regex/regex_extra.h
@@ -6,9 +6,13 @@
 
 #if (defined(REGEX) && REGEX == 1) || (!defined(REGEX))
 
+#if !(WIN32|WINNT)
+
 #define regexec php_regexec
 #define regerror php_regerror
 #define regfree php_regfree
 #define regcomp php_regcomp
 
 #endif
+
+#endif

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 55e4d9ef926a30bd4f5a63165393f1c20b74c4a2..0d1e929cab2d81298c842ae46f3b1cd0f7c8bc39 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -779,7 +779,8 @@ InputPath=".\configuration-parser.y"
 \r
 BuildCmds= \\r
        if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
 \r
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
@@ -795,7 +796,8 @@ InputPath=".\configuration-parser.y"
 \r
 BuildCmds= \\r
        if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \\r
-       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+       if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \\r
+       \r
 \r
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
    $(BuildCmds)\r
@@ -818,7 +820,7 @@ InputPath=.\ext\standard\parsedate.y
 \r
 "ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
        cd ext\standard \r
-       if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y  \\r
+       if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y \r
        if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y \r
        \r
 # End Custom Build\r

diff --git a/regex/regex_extra.h b/regex/regex_extra.h
index b839ddc2ad8f12f44145a3ab79b266d1e3e58def..511df57f675b689d0a98ba2036990940e5b8a66b 100644 (file)
--- a/regex/regex_extra.h
+++ b/regex/regex_extra.h
@@ -6,9 +6,13 @@
 
 #if (defined(REGEX) && REGEX == 1) || (!defined(REGEX))
 
+#if !(WIN32|WINNT)
+
 #define regexec php_regexec
 #define regerror php_regerror
 #define regfree php_regfree
 #define regcomp php_regcomp
 
 #endif
+
+#endif