cvs: /php4/ext/oci8 oci8.c /php4/ext/oracle oracle.c

thies Fri Apr 28 03:37:47 2000 EDT Modified files: /php4/ext/oci8 oci8.c /php4/ext/oracle oracle.c Log: compile fix Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.75 php4/ext/oci8/oci8.c:1.76 --- php4/ext/oci8/oci8.c:1.75 Thu Apr 27 07:32:58 2000 +++ php4/ext/oci8/oci8.c Fri Apr 28 03:37:16 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.75 2000/04/27 14:32:58 thies Exp $ */ +/* $Id: oci8.c,v 1.76 2000/04/28 10:37:16 thies Exp $ */ /* TODO list: * @@ -74,7 +74,7 @@ #define SAFE_STRING(s) ((s)?(s):"") -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 #include "build-defs.h" #endif @@ -490,7 +490,7 @@ 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 ); Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.42 php4/ext/oracle/oracle.c:1.43 --- php4/ext/oracle/oracle.c:1.42 Fri Apr 21 08:04:40 2000 +++ php4/ext/oracle/oracle.c Fri Apr 28 03:37:16 2000 @@ -51,6 +51,10 @@ #define PHP_ORA_API #endif +#ifndef PHP_WIN32 +#include "build-defs.h" +#endif + #ifdef ZTS int ora_globals_id; #else