sixd Mon, 25 Jul 2011 17:30:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313681
Log:
Patch r313663 and r313665 to allow PECL builds to work with earlier releases
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
U php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
U php/php-src/trunk/ext/oci8/oci8.c
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2011-07-25 17:25:47 UTC
(rev 313680)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2011-07-25 17:30:09 UTC
(rev 313681)
@@ -937,7 +937,11 @@
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 @@
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 @@
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 = {
Modified: php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/oci8.c 2011-07-25 17:25:47 UTC
(rev 313680)
+++ php/php-src/branches/PHP_5_4/ext/oci8/oci8.c 2011-07-25 17:30:09 UTC
(rev 313681)
@@ -937,7 +937,11 @@
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 @@
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 @@
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 = {
Modified: php/php-src/trunk/ext/oci8/oci8.c
===================================================================
--- php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 17:25:47 UTC (rev 313680)
+++ php/php-src/trunk/ext/oci8/oci8.c 2011-07-25 17:30:09 UTC (rev 313681)
@@ -937,7 +937,11 @@
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 @@
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 @@
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 = {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
