cvs: /php4 php4dllts.dsp /php4/ext/mysql php_mysql.c

zeev Sat Feb 19 23:28:16 2000 EDT Modified files: /php4 php4dllts.dsp /php4/ext/mysql php_mysql.c Log: Win32 compile fix Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.56 php4/php4dllts.dsp:1.57 --- php4/php4dllts.dsp:1.56 Sat Feb 19 14:41:53 2000 +++ php4/php4dllts.dsp Sat Feb 19 23:27:45 2000 @@ -1002,7 +1002,27 @@ !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 Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.32 php4/ext/mysql/php_mysql.c:1.33 --- php4/ext/mysql/php_mysql.c:1.32 Sat Feb 19 21:32:51 2000 +++ php4/ext/mysql/php_mysql.c Sat Feb 19 23:27:46 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.32 2000/02/20 05:32:51 evan Exp $ */ +/* $Id: php_mysql.c,v 1.33 2000/02/20 07:27:46 zeev Exp $ */ /* TODO: @@ -36,15 +36,15 @@ #define signal(a,b) NULL #else #include "build-defs.h" +#if HAVE_SIGNAL_H +#include <signal.h> +#endif #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif #include <netdb.h> #include <netinet/in.h> -#endif -#if HAVE_SIGNAL_H -#include <signal.h> #endif /* True globals, no need for thread safety */