#if WIN.* => #ifdef PHP_WIN32

#if !(WIN.* => #ifndef PHP_WIN32

diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h
index 160246d8a18d2732ecbb0a83f67a624a0b1654b2..dcde3aeedb90fc0335b329be990cfe2a94d1df38 100644 (file)
--- a/ext/hyperwave/php_hyperwave.h
+++ b/ext/hyperwave/php_hyperwave.h
@@ -33,7 +33,7 @@
 #define HYPERWAVE 1
 #endif
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_HW_API __declspec(dllexport)
 #else
 #define PHP_HW_API

diff --git a/ext/imap/imap.h b/ext/imap/imap.h
index 082751f4427a172d885310264ee615e4ac401775..a62e455e09ac7da2f989c514a3bed43362b477ca 100644 (file)
--- a/ext/imap/imap.h
+++ b/ext/imap/imap.h
@@ -8,7 +8,7 @@
 
 #if HAVE_IMAP
 
-#if !(WIN32||WINNT)
+#ifndef PHP_WIN32
 #include "build-defs.h"
 #endif
 
@@ -74,7 +74,7 @@ PHP_FUNCTION(imap_mail_compose);
 PHP_FUNCTION(imap_alerts);
 PHP_FUNCTION(imap_errors);
 PHP_FUNCTION(imap_last_error);
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
 PHP_FUNCTION(imap_mail);
 #endif
 PHP_FUNCTION(imap_search);

diff --git a/ext/informix/php_informix.h b/ext/informix/php_informix.h
index ea9c311b5ff2cb76aeba53c5275e93915c5d00c8..c12f453a886e8a0d56c51faed658cdf1b5628539 100644 (file)
--- a/ext/informix/php_informix.h
+++ b/ext/informix/php_informix.h
@@ -40,7 +40,7 @@
 #define HAVE_IFX 1
 #endif
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_IFX_API __declspec(dllexport)
 #else
 #define PHP_IFX_API

diff --git a/ext/java/java.c b/ext/java/java.c
index d14fc4d1c5633d21bc98e4492cef4ad4d6c677b4..7cb33c4e3576a5e67edd7fa3bb08ba7ce3353449 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -50,7 +50,7 @@
 #endif
 #endif
 
-#if WIN32|WINNT
+#ifdef PHP_WIN32
 #ifdef JNI_12
 #pragma comment(lib,"jvm.lib")
 #else
@@ -106,7 +106,7 @@ void jvm_destroy() {
     (*jvm)->DestroyJavaVM(jvm);
     jvm = 0;
   }
-#if !(WIN32||WINNT)
+#ifndef PHP_WIN32
   if (javadl) dlclose(javadl);
 #endif
   php_reflect = 0;
@@ -148,7 +148,7 @@ static int jvm_create() {
 
   if (!classpath) classpath = getenv("CLASSPATH");
 
-#if !(WIN32||WINNT)
+#ifndef PHP_WIN32
   if (!libpath)   libpath   = getenv("LD_LIBRARY_PATH");
   if (javalib) {
     javadl = dlopen(javalib, RTLD_GLOBAL | RTLD_LAZY);

diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index 9b356e0e32d9869a29a55beab2f04e2f88e25753..aff9a145aebf3a0317c0449a8827ce0fed5a7142 100644 (file)
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -27,7 +27,7 @@
 # define HAVE_MYSQL 1
 #endif
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_MYSQL_API __declspec(dllexport)
 #else
 #define PHP_MYSQL_API

diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 18bb23ba2863051e95c02a15f9adc4cec3f56e82..07c73d84915144fd1ddf977b9fbb729f193d2352 100644 (file)
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -47,7 +47,7 @@
 #  endif
 # endif /* osf alpha */
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_OCI_API __declspec(dllexport)
 #else
 #define PHP_OCI_API

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 784151855347ce90de60857d641ae22ef59e5a06..6719e4a0ce33d7039e2a4eaa9214c1e9a2c29e8d 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -50,7 +50,7 @@
 #define min(a, b) ((a) > (b) ? (b) : (a))
 #endif
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_ORA_API __declspec(dllexport)
 #else
 #define PHP_ORA_API
@@ -1513,7 +1513,7 @@ PHP_FUNCTION(ora_errorcode)
 
 PHP_MINFO_FUNCTION(oracle)
 {
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
        php_printf("Oracle version: %s<br>\n"
                            "Compile-time ORACLE_HOME: %s<br>\n"
                            "Libraries used: %s",

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 37dff8235b46ecb18add492054a527f8046316c7..0486801fe5ce3ef08168469d7e85dc61c7dea6e8 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -52,7 +52,7 @@ extern zend_module_entry pgsql_module_entry;
 #include <libpq/libpq-fs.h>
 #endif
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_PGSQL_API __declspec(dllexport)
 #else
 #define PHP_PGSQL_API

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index d14fc4d1c5633d21bc98e4492cef4ad4d6c677b4..7cb33c4e3576a5e67edd7fa3bb08ba7ce3353449 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -50,7 +50,7 @@
 #endif
 #endif
 
-#if WIN32|WINNT
+#ifdef PHP_WIN32
 #ifdef JNI_12
 #pragma comment(lib,"jvm.lib")
 #else
@@ -106,7 +106,7 @@ void jvm_destroy() {
     (*jvm)->DestroyJavaVM(jvm);
     jvm = 0;
   }
-#if !(WIN32||WINNT)
+#ifndef PHP_WIN32
   if (javadl) dlclose(javadl);
 #endif
   php_reflect = 0;
@@ -148,7 +148,7 @@ static int jvm_create() {
 
   if (!classpath) classpath = getenv("CLASSPATH");
 
-#if !(WIN32||WINNT)
+#ifndef PHP_WIN32
   if (!libpath)   libpath   = getenv("LD_LIBRARY_PATH");
   if (javalib) {
     javadl = dlopen(javalib, RTLD_GLOBAL | RTLD_LAZY);

diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 66d7e8174122895d59cd233d308c9923ab25b5f5..61450dce135dcead1c8c8e9b2572f7266346efdd 100644 (file)
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -38,7 +38,7 @@ extern zend_module_entry xml_module_entry;
 #include <xmltok.h>
 #include <xmlparse.h>
 
-#if WIN32||WINNT
+#ifdef PHP_WIN32
 #define PHP_XML_API __declspec(dllexport)
 #else
 #define PHP_XML_API