From e3f95d1c5f21bb786a297a390bb633201fd49e25 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sun, 20 Feb 2000 07:27:46 +0000 Subject: [PATCH] Win32 compile fix --- ext/mysql/php_mysql.c | 6 +++--- php4dllts.dsp | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 89364a4f02..b7ab8336d1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -36,6 +36,9 @@ #define signal(a,b) NULL #else #include "build-defs.h" +#if HAVE_SIGNAL_H +#include +#endif #if HAVE_SYS_TYPES_H #include @@ -43,9 +46,6 @@ #include #include #endif -#if HAVE_SIGNAL_H -#include -#endif /* True globals, no need for thread safety */ static int le_result,le_link,le_plink; diff --git a/php4dllts.dsp b/php4dllts.dsp index b4a5ec17eb..151c92935d 100644 --- a/php4dllts.dsp +++ b/php4dllts.dsp @@ -1002,8 +1002,28 @@ InputPath=.\ext\standard\parsedate.y !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" +# Begin Custom Build +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 "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y + +# End Custom Build + !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" +# Begin Custom Build +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 "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y + +# End Custom Build + !ENDIF # End Source File -- 2.50.1