diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/hyperwave/php_hyperwave.h | 2 | ||||
| -rw-r--r-- | ext/imap/imap.h | 4 | ||||
| -rw-r--r-- | ext/informix/php_informix.h | 2 | ||||
| -rw-r--r-- | ext/java/java.c | 6 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.h | 2 | ||||
| -rw-r--r-- | ext/oci8/php_oci8.h | 2 | ||||
| -rw-r--r-- | ext/oracle/oracle.c | 4 | ||||
| -rw-r--r-- | ext/pgsql/php_pgsql.h | 2 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 6 | ||||
| -rw-r--r-- | ext/xml/php_xml.h | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h index 160246d8a1..dcde3aeedb 100644 --- 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 082751f442..a62e455e09 100644 --- 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 ea9c311b5f..c12f453a88 100644 --- 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 d14fc4d1c5..7cb33c4e35 100644 --- 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 9b356e0e32..aff9a145ae 100644 --- 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 18bb23ba28..07c73d8491 100644 --- 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 7841518553..6719e4a0ce 100644 --- 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 37dff8235b..0486801fe5 100644 --- 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 d14fc4d1c5..7cb33c4e35 100644 --- 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 66d7e81741..61450dce13 100644 --- 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 |