diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/configuration-parser.y | 2 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | win32/time.h | 4 |
4 files changed, 6 insertions, 4 deletions
@@ -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 681601d2f1..c5010c3e43 100644 --- 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 bd60fd249e..d788be6b79 100644 --- 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 304d0536fb..b8f59ceb3a 100644 --- 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 { |