diff options
| -rw-r--r-- | ext/ereg/regex/regex_extra.h | 4 | ||||
| -rw-r--r-- | php4dllts.dsp | 8 | ||||
| -rw-r--r-- | regex/regex_extra.h | 4 |
3 files changed, 13 insertions, 3 deletions
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 |