- Make Windows compile again.

diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c
index 37c045ef3aed6979a568133ee31e2cd288ae48c1..f9fe7b6e79c3f506681425effea880155b725ef0 100644 (file)
--- a/ext/rpc/com/COM.c
+++ b/ext/rpc/com/COM.c
@@ -33,7 +33,7 @@
  * Zeev
  */
 
-#if WIN32|WINNT
+#ifdef PHP_WIN32
 
 #define _WIN32_DCOM
 
@@ -41,6 +41,7 @@
 #include "php_COM.h"
 #include "zend_compile.h"
 #include "php_ini.h"
+#include "php_reentrancy.h"
 
 #include "objbase.h"
 #include "olestd.h" 
@@ -182,9 +183,9 @@ static PHP_INI_MH(OnTypelibFileChange)
                if (typelib_name_buffer[0]==';') {
                        continue;
                }
-               typelib_name = strtok_r(typelib_name_buffer, "\r\n", &strtok_buf); /* get rid of newlines */
-               typelib_name = strtok_r(typelib_name, "#", &strtok_buf);
-               modifier = strtok_r(NULL, "#", &strtok_buf);
+               typelib_name = php_strtok_r(typelib_name_buffer, "\r\n", &strtok_buf); /* get rid of newlines */
+               typelib_name = php_strtok_r(typelib_name, "#", &strtok_buf);
+               modifier = php_strtok_r(NULL, "#", &strtok_buf);
                if (modifier) {
                        if (!strcmp(modifier, "cis") || !strcmp(modifier, "case_insensitive")) {
                                mode &= ~CONST_CS;

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index aed82525943e1dab68f907fa4aa3ae848de8cf85..96d844a1a0cccd6f272ada2ccebe3dddabd6f3ae 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -47,6 +47,7 @@
 #include <locale.h>
 #endif
 #include "zend.h"
+#include "zend_extensions.h"
 #include "php_ini.h"
 #include "php_globals.h"
 #include "main.h"
@@ -317,13 +318,15 @@ static void define_command_line_ini_entry(char *arg)
 void php_register_command_line_global_vars(char **arg)
 {
        char *var, *val;
+       ELS_FETCH();
+       PLS_FETCH();
 
        var = *arg;
        val = strchr(var, '=');
        if (!val) {
                printf("No value specified for variable '%s'\n", var);
        } else {
-               *val++ = NULL;
+               *val++ = '\0';
                php_register_variable(var, val, NULL ELS_CC PLS_CC);
        }
        efree(*arg);