Win32 compile fix

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 89364a4f027e820d1059877bc72b77eed3c27f7c..b7ab8336d1b1c265fb2882e865594a16204fe2cb 100644 (file)
--- 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 <signal.h>
+#endif
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -43,9 +46,6 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #endif
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#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 b4a5ec17eb4579366cfffdb941ee6659dc6cddb2..151c92935d9f777d0ca403f43a3c6cddb3ebe311 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -1002,8 +1002,28 @@ InputPath=.\ext\standard\parsedate.y
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
+# Begin Custom Build\r
+InputPath=.\ext\standard\parsedate.y\r
+\r
+"ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       cd ext\standard \r
+       if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y \r
+       if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y \r
+       \r
+# End Custom Build\r
+\r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
+# Begin Custom Build\r
+InputPath=.\ext\standard\parsedate.y\r
+\r
+"ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       cd ext\standard \r
+       if not "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "%CYGWIN%\share\bison.simple" parsedate.y \r
+       if "X%CYGWIN%"=="X" bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y \r
+       \r
+# End Custom Build\r
+\r
 !ENDIF \r
 \r
 # End Source File\r