cvs: php4 /ext/oci8 config.m4 oci8.c oci8.dsp

thies Sat Apr 14 02:51:29 2001 EDT Modified files: /php4/ext/oci8 config.m4 oci8.c oci8.dsp Log: enable temporary LOBs when we detect oracle 8.1 enabled by default in Win32 project! Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.26 php4/ext/oci8/config.m4:1.27 --- php4/ext/oci8/config.m4:1.26 Tue Mar 27 12:34:37 2001 +++ php4/ext/oci8/config.m4 Sat Apr 14 02:51:29 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26 2001/03/27 20:34:37 sniper Exp $ +dnl $Id: config.m4,v 1.27 2001/04/14 09:51:29 thies Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -73,6 +73,7 @@ 8.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) ;; *) AC_MSG_ERROR(Unsupported Oracle version!) Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.116 php4/ext/oci8/oci8.c:1.117 --- php4/ext/oci8/oci8.c:1.116 Sat Apr 14 01:38:46 2001 +++ php4/ext/oci8/oci8.c Sat Apr 14 02:51:29 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.116 2001/04/14 08:38:46 thies Exp $ */ +/* $Id: oci8.c,v 1.117 2001/04/14 09:51:29 thies Exp $ */ /* TODO list: * @@ -54,7 +54,7 @@ #include "php.h" #include "ext/standard/info.h" -/* #define WITH_TEMP_LOBS 1 */ +/* #define HAVE_OCI8_TEMP_LOB 1 */ #define WITH_COLLECTIONS 1 #if HAVE_OCI8 @@ -209,7 +209,7 @@ PHP_FUNCTION(ocistatementtype); PHP_FUNCTION(ocirowcount); PHP_FUNCTION(ocisetprefetch); -#ifdef WITH_TEMP_LOBS +#ifdef HAVE_OCI8_TEMP_LOB PHP_FUNCTION(ociwritetemporarylob); PHP_FUNCTION(ocicloselob); #endif @@ -328,7 +328,7 @@ static zend_function_entry php_oci_lob_class_functions[] = { PHP_FALIAS(load, ociloadlob, NULL) PHP_FALIAS(writetofile, ociwritelobtofile,NULL) -#ifdef WITH_TEMP_LOBS +#ifdef HAVE_OCI8_TEMP_LOB PHP_FALIAS(writetemporary, ociwritetemporarylob,NULL) PHP_FALIAS(close, ocicloselob, NULL) #endif @@ -584,7 +584,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.116 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.117 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -3182,7 +3182,7 @@ } /* }}} */ -#ifdef WITH_TEMP_LOBS +#ifdef HAVE_OCI8_TEMP_LOB /* {{{ proto int ociwritetemporarylob(int stmt, int loc, string var) Return the row count of an OCI statement */ Index: php4/ext/oci8/oci8.dsp diff -u php4/ext/oci8/oci8.dsp:1.9 php4/ext/oci8/oci8.dsp:1.10 --- php4/ext/oci8/oci8.dsp:1.9 Thu Aug 24 10:48:25 2000 +++ php4/ext/oci8/oci8.dsp Sat Apr 14 02:51:29 2001 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\oci805\include" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D COMPILE_DL_OCI8=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\oci805\include" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D HAVE_OCI8_TEMP_LOB=1 /D COMPILE_DL_OCI8=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\include\oci805" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D COMPILE_DL_OCI8=1 /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\\" /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "..\..\..\php_build\include\oci805" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_OCI8=1 /D HAVE_OCI8_TEMP_LOB=1 /D COMPILE_DL_OCI8=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG"