]> granicus.if.org Git - php/commitdiff
Patch r313663 and r313665 to allow PECL builds to work with earlier releases
authorChristopher Jones <sixd@php.net>
Mon, 25 Jul 2011 17:30:09 +0000 (17:30 +0000)
committerChristopher Jones <sixd@php.net>
Mon, 25 Jul 2011 17:30:09 +0000 (17:30 +0000)
ext/oci8/oci8.c

index 9417dec0d9e972453466d2d43e60561ab6f33e62..4512c1f848fcdca02acd19fd0158f1a66461376e 100644 (file)
@@ -937,7 +937,11 @@ zend_function_entry php_oci_functions[] = {
        PHP_FALIAS(ocicollsize,                 oci_collection_size,    arginfo_oci_collection_size)
        PHP_FALIAS(ocicollmax,                  oci_collection_max,             arginfo_oci_collection_max)
        PHP_FALIAS(ocicolltrim,                 oci_collection_trim,    arginfo_oci_collection_trim)
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 7) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4) || (PHP_MAJOR_VERSION > 5)
        PHP_FE_END
+#else
+       {NULL,NULL,NULL}
+#endif
 };
 
 static
@@ -968,7 +972,11 @@ zend_function_entry php_oci_lob_class_functions[] = {
        PHP_FALIAS(save,                oci_lob_save,                   arginfo_oci_lob_save_method)
        PHP_FALIAS(savefile,    oci_lob_import,                 arginfo_oci_lob_import_method)
        PHP_FALIAS(free,                oci_free_descriptor,    arginfo_oci_free_descriptor_method)
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 7) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4) || (PHP_MAJOR_VERSION > 5)
        PHP_FE_END
+#else
+       {NULL,NULL,NULL}
+#endif
 };
 
 static
@@ -985,7 +993,11 @@ zend_function_entry php_oci_coll_class_functions[] = {
        PHP_FALIAS(max,                   oci_collection_max,                           arginfo_oci_collection_max_method)
        PHP_FALIAS(trim,                  oci_collection_trim,                          arginfo_oci_collection_trim_method)
        PHP_FALIAS(free,                  oci_free_collection,                          arginfo_oci_collection_free_method)
+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION >= 7) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4) || (PHP_MAJOR_VERSION > 5)
        PHP_FE_END
+#else
+       {NULL,NULL,NULL}
+#endif
 };
 
 zend_module_entry oci8_module_entry = {