From: Andi Gutmans <andi@php.net>
Date: Sat, 13 Nov 1999 18:03:07 +0000 (+0000)
Subject: - Make Win32 compile again
X-Git-Tag: php-4.0b3_RC5~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c1b3622351aef836033a9c9786e57bd9b363724;p=php

- Make Win32 compile again
---

diff --git a/ext/ereg/regex/regex_extra.h b/ext/ereg/regex/regex_extra.h
index b839ddc2ad..511df57f67 100644
--- 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 55e4d9ef92..0d1e929cab 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -779,7 +779,8 @@ InputPath=".\configuration-parser.y"
 
 BuildCmds= \
 	if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
-	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \
+	
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -795,7 +796,8 @@ InputPath=".\configuration-parser.y"
 
 BuildCmds= \
 	if not"X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \
-	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+	if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \
+	
 
 "configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -818,7 +820,7 @@ InputPath=.\ext\standard\parsedate.y
 
 "ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	cd ext\standard 
-	if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y  \
+	if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y 
 	if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y 
 	
 # End Custom Build
diff --git a/regex/regex_extra.h b/regex/regex_extra.h
index b839ddc2ad..511df57f67 100644
--- 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