diff options
| author | Andi Gutmans <andi@php.net> | 2000-05-05 07:18:50 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-05-05 07:18:50 +0000 |
| commit | 198537b70f9592245b609bbb5a33c9231e25dcf8 (patch) | |
| tree | f30ee68be79b33dcc09327001210eed2fb3a57ad /ext/rpc | |
| parent | 5db0f958c42aec58d9824694b8c6816c173787fe (diff) | |
| download | php-git-198537b70f9592245b609bbb5a33c9231e25dcf8.tar.gz | |
- Make Windows compile again.
Diffstat (limited to 'ext/rpc')
| -rw-r--r-- | ext/rpc/com/COM.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 37c045ef3a..f9fe7b6e79 100644 --- 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; |