- Revert bogus time.h commit

- Fixed a problem under some versions of Windows that could cause PHP to hang
  on startup if errors occured, e.g. in the php.ini file

diff --git a/NEWS b/NEWS
index 49f3604545e383c7ee9fb267b3430db54e1126c2..557e654d8423d9835ffa617df346de9d180fcf37 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ??? 2000, Version 4.0.2
+- Fixed a problem under some versions of Windows that could cause PHP to hang
+  on startup if errors occured, e.g. in the php.ini file (Zeev)
 - Fixed opendir() again.  It should actually work well continuously now (Zeev)
 - Added three additional arguments to be sent to a user-defined error handler -
   the filename and line number in which the error occured, and the context

diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index 681601d2f134ec813617f2671ec2905329801f85..c5010c3e43655f4da749abcee6f35d8bf981dddc 100644 (file)
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -127,7 +127,7 @@ static void yyerror(char *str)
        
        sprintf(error_buf, "Error parsing %s on line %d\n", currently_parsed_filename, cfglineno);
 #ifdef PHP_WIN32
-       MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_SERVICE_NOTIFICATION|MB_TOPMOST);
+       MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
 #else
        fprintf(stderr, "PHP:  %s", error_buf);
 #endif

diff --git a/main/main.c b/main/main.c
index bd60fd249e7a0c5cf067897419d0ee1948d55c28..d788be6b7923e23c5c0c96b6d9f8a3a991a47b10 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -377,7 +377,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 
 #ifdef PHP_WIN32
                                if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
-                                       MessageBox(NULL, buffer, error_type_str, MB_OK|MB_SERVICE_NOTIFICATION|MB_TOPMOST);
+                                       MessageBox(NULL, buffer, error_type_str, MB_OK|ZEND_SERVICE_MB_STYLE);
                                }
 #endif
                                snprintf(log_buffer, 1024, "PHP %s:  %s in %s on line %d", error_type_str, buffer, error_filename, error_lineno);

diff --git a/win32/time.h b/win32/time.h
index 304d0536fb5da8261d1495928fed106fd31b658e..b8f59ceb3a2c6ca8ffb050de4b61c9ced7a4472c 100644 (file)
--- a/win32/time.h
+++ b/win32/time.h
@@ -13,8 +13,8 @@
 #define _DH_TIME_H
 
 /* Include stuff ************************************************************ */
-#include <winsock2.h>
-//#include <time.h>
+#include <winsock.h>
+#include <time.h>
 
 /* Struct stuff ************************************************************* */
 struct timezone {