* Make Win32 build work again

* Make error_reporting value prior to the standard initialization be
  set so that errors show up

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index ea5968e043ea4080906cc4a967de2d8a0f6749c4..227e606c5d83080b08146111e2dc0141cd704a27 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -248,7 +248,7 @@ static void _php3_fsockopen(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
        switch(arg_count) {
                case 5:
                        convert_to_double(args[4]);
-                       conv = (unsigned long) args[4]->value.dval * 1000000.0;
+                       conv = (unsigned long) (args[4]->value.dval * 1000000.0);
                        timeout.tv_sec = conv / 1000000;
                        timeout.tv_usec = conv % 1000000;
                        /* fall-through */

diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index df75728bb00ce193c1b074e0f456d27c9cf585aa..6552c517a23cd7d1b50c2790b54cd5d2f2279593 100644 (file)
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -24,6 +24,10 @@
 # include "php_config.h"
 #endif
 
+#if WIN32||WINNT
+#include <malloc.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
@@ -41,10 +45,12 @@
 #include <alloca.h>
 #endif
 
-#ifndef HAVE_TM_ZONE
-#ifndef _TIMEZONE
+#if WIN32||WINNT
+#include <time.h>
+#else
+#      if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE)
 extern time_t timezone;
-#endif
+#      endif
 #endif
 
 #define yylhs          date_yylhs

diff --git a/main/main.c b/main/main.c
index 59d1a54b375c91647bd557d243a54e81e9f4ec14..361a3c685352227e58387ab079114d7e967f4762 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -768,11 +768,10 @@ int php_module_startup(sapi_module_struct *sf)
        sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id);
 #endif
 #if (WIN32|WINNT) && !(USE_SAPI)
-       WORD wVersionRequested;
+       WORD wVersionRequested = MAKEWORD(2, 0);
        WSADATA wsaData;
-
-       wVersionRequested = MAKEWORD(2, 0);
 #endif
+       ELS_FETCH();
 
        SG(server_context) = NULL;
        SG(request_info).request_method = NULL;
@@ -782,6 +781,8 @@ int php_module_startup(sapi_module_struct *sf)
                return SUCCESS;
        }
 
+       EG(error_reporting) = E_ALL & ~E_NOTICE;
+       
        sapi_module = *sf;
 
        zend_output_startup();

diff --git a/php4dll.dsp b/php4dll.dsp
index 88e260aa56978dbea55fe0f32735bf89dccc23b8..abc95a1fc7014dbd49210e9149e12b559415b7da 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -363,6 +363,10 @@ SOURCE=.\ext\standard\pageinfo.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\parsedate.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\pcre\php_pcre.c\r
 # End Source File\r
 # Begin Source File\r
@@ -738,6 +742,26 @@ BuildCmds= \
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ext\standard\parsedate.y\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\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
+       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)" == "php4dll - Win32 Release"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Scanners"\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index fe93f840423b24c818042058312b07bd179ac18e..0925f76d9e28e5df3361fb9557f323b4cafe4f32 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -371,6 +371,10 @@ SOURCE=.\ext\standard\pageinfo.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\standard\parsedate.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\ext\pcre\php_pcre.c\r
 # End Source File\r
 # Begin Source File\r
@@ -754,6 +758,26 @@ BuildCmds= \
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\ext\standard\parsedate.y\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_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
+       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"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Scanners"\r