summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>2000-04-28 10:37:17 +0000
committerThies C. Arntzen <thies@php.net>2000-04-28 10:37:17 +0000
commitea9be8b88b6c4801daad721da2d0aedc19ba5505 (patch)
tree4b9490ef54705690b744e2ef3b02e0aff56683d0
parent83ce0793a75c3c553bc6696c12cbf0c260542dcb (diff)
downloadphp-git-ea9be8b88b6c4801daad721da2d0aedc19ba5505.tar.gz
compile fix
-rw-r--r--ext/oci8/oci8.c4
-rw-r--r--ext/oracle/oracle.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 0ad31969fe..5e6241cca8 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -74,7 +74,7 @@ static zend_class_entry *oci_lob_class_entry_ptr;
#define SAFE_STRING(s) ((s)?(s):"")
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
#include "build-defs.h"
#endif
@@ -490,7 +490,7 @@ PHP_MINFO_FUNCTION(oci)
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_ORACLE_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_ORACLE_HOME );
php_info_print_table_row(2, "Libraries Used", PHP_ORACLE_LIBS );
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 31259c0a15..cf71bb8aec 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -51,6 +51,10 @@
#define PHP_ORA_API
#endif
+#ifndef PHP_WIN32
+#include "build-defs.h"
+#endif
+
#ifdef ZTS
int ora_globals_id;
#else