cvs: /php4 php4dllts.dsp /php4/regex regex_extra.h

From: Date: Sat, 13 Nov 1999 18:03:38 +0000
Subject: cvs: /php4 php4dllts.dsp /php4/regex regex_extra.h
Groups: php.version4 
Request: Send a blank email to php-version4+get-6190@lists.php.net to get a copy of this message
andi Sat Nov 13 13:03:38 1999 EDT Modified files: /php4 php4dllts.dsp /php4/regex regex_extra.h Log: - Make Win32 compile again Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.32 php4/php4dllts.dsp:1.33 --- php4/php4dllts.dsp:1.32 Wed Oct 27 20:18:51 1999 +++ php4/php4dllts.dsp Sat Nov 13 13:03:06 1999 @@ -779,7 +779,8 @@ 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 @@ 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 @@ "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 Index: php4/regex/regex_extra.h diff -u php4/regex/regex_extra.h:1.1 php4/regex/regex_extra.h:1.2 --- php4/regex/regex_extra.h:1.1 Sat Nov 13 11:51:32 1999 +++ php4/regex/regex_extra.h Sat Nov 13 13:03:07 1999 @@ -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

« previous php.version4 (#6190) next »