cvs: php-src /main main.c
| From: | Edin Kadribasic | Date: | Wed, 24 May 2006 22:00:57 +0000 |
| Subject: | cvs: php-src /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38399@lists.php.net to get a copy of this message | ||
edink Wed May 24 22:00:57 2006 UTC
Modified files:
/php-src/main main.c
Log:
MFB: Initialize windows globals, fixes #37428
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.690&r2=1.691&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.690 php-src/main/main.c:1.691
--- php-src/main/main.c:1.690 Fri May 19 06:11:02 2006
+++ php-src/main/main.c Wed May 24 22:00:57 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.690 2006/05/19 06:11:02 dmitry Exp $ */
+/* $Id: main.c,v 1.691 2006/05/24 22:00:57 edink Exp $ */
/* {{{ includes
*/
@@ -30,6 +30,7 @@
#ifdef PHP_WIN32
#include "win32/time.h"
#include "win32/signal.h"
+#include "win32/php_win32_globals.h"
#include <process.h>
#elif defined(NETWARE)
#include <sys/timeval.h>
@@ -1539,6 +1540,9 @@
executor_globals = ts_resource(executor_globals_id);
ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor)
core_globals_ctor, NULL);
core_globals = ts_resource(core_globals_id);
+#ifdef PHP_WIN32
+ ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor)
php_win32_core_globals_ctor, NULL);
+#endif
#endif
EG(bailout) = NULL;
EG(error_reporting) = E_ALL & ~E_NOTICE;