- 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

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

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

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);

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 {