enable temporary LOBs when we detect oracle 8.1

enabled by default in Win32 project!

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index fcc03f35b96c27e4ab2f7dfdbbd45e9b69753b9e..394d857a211b7da8418454702d10c21f776a69ea 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -73,6 +73,7 @@ if test "$PHP_OCI8" != "no"; then
        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!)

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 5e6e48008d00d203607fed93877afdc58bc5c69f..ca7725e7cf820f71292cd8fe79c34838f7f2b060 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -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(ociserverversion);
 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_functions[] = {
 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
@@ -3182,7 +3182,7 @@ PHP_FUNCTION(ociwritelobtofile)
 }
 /* }}} */
 
-#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 */
 

diff --git a/ext/oci8/oci8.dsp b/ext/oci8/oci8.dsp
index f8829e9612201e07ea372ddc61e419f6fa167c12..46d071c40583dd17c67fe64c71f32bc0898e226b 100644 (file)
--- a/ext/oci8/oci8.dsp
+++ b/ext/oci8/oci8.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # 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\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r