diff options
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/main/php.h b/main/php.h index e9a099ae1f..083e89c377 100644 --- a/main/php.h +++ b/main/php.h @@ -35,6 +35,8 @@ #include "php_version.h" #include "zend.h" +#define PHP_WIN32 ZEND_WIN32 + /* automake defines PACKAGE and VERSION for Zend too */ #ifdef PACKAGE # undef PACKAGE @@ -59,7 +61,7 @@ extern unsigned char second_arg_allow_ref[]; */ -#if WIN32 +#if PHP_WIN32 #include "config.w32.h" #include "win95nt.h" # ifdef PHP_EXPORTS @@ -80,7 +82,7 @@ extern unsigned char second_arg_allow_ref[]; #define DEBUG ZEND_DEBUG -#if DEBUG || !(defined(__GNUC__)||defined(WIN32)) +#if DEBUG || !(defined(__GNUC__)||PHP_WIN32 #ifdef inline #undef inline #endif @@ -212,7 +214,7 @@ extern char *strerror(int); #endif #if HAVE_PWD_H -# if WIN32||WINNT +# if PHP_WIN32 #include "win32/pwd.h" #include "win32/param.h" # else @@ -288,7 +290,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list); /* global variables */ extern pval *data; -#if !(WIN32||WINNT) +#if !(PHP_WIN32) extern char **environ; #endif |