sixd Thu Jul 17 00:36:02 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c
Log:
Allow PECL builds with PHP 4. No MTH needed
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.18&r2=1.269.2.16.2.38.2.19&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.18
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.19
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.18 Wed Jul 16 23:55:13 2008
+++ php-src/ext/oci8/oci8.c Thu Jul 17 00:36:02 2008
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.18 2008/07/16 23:55:13 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.19 2008/07/17 00:36:02 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -112,6 +112,8 @@
#endif /* COMPILE_DL */
/* }}} */
+#ifdef ZEND_ENGINE_2
+
/* {{{ Function arginfo */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3)
@@ -664,6 +666,108 @@
ZEND_END_ARG_INFO()
/* }}} */
+#else /* ZEND_ENGINE_2 */
+/* {{{ Keep the old arginfo behavior when building with PHP 4 */
+
+static unsigned char arginfo_ocifetchinto[] = { 2, BYREF_NONE, BYREF_FORCE };
+static unsigned char arginfo_oci_fetch_all[] = { 2, BYREF_NONE, BYREF_FORCE };
+static unsigned char arginfo_oci_define_by_name[] = { 3, BYREF_NONE,
BYREF_NONE, BYREF_FORCE };
+static unsigned char arginfo_oci_bind_by_name[] = { 3, BYREF_NONE, BYREF_NONE,
BYREF_FORCE };
+static unsigned char arginfo_oci_bind_array_by_name[] = { 3, BYREF_NONE,
BYREF_NONE, BYREF_FORCE };
+
+#define arginfo_oci_free_descriptor
NULL
+#define arginfo_oci_lob_save
NULL
+#define arginfo_oci_lob_import
NULL
+#define arginfo_oci_lob_load
NULL
+#define arginfo_oci_lob_read
NULL
+#define arginfo_oci_lob_eof
NULL
+#define arginfo_oci_lob_tell
NULL
+#define arginfo_oci_lob_rewind
NULL
+#define arginfo_oci_lob_seek
NULL
+#define arginfo_oci_lob_size
NULL
+#define arginfo_oci_lob_write
NULL
+#define arginfo_oci_lob_append
NULL
+#define arginfo_oci_lob_truncate
NULL
+#define arginfo_oci_lob_erase
NULL
+#define arginfo_oci_lob_flush
NULL
+#define arginfo_ocisetbufferinglob
NULL
+#define arginfo_ocigetbufferinglob
NULL
+#define arginfo_oci_lob_copy
NULL
+#define arginfo_oci_lob_is_equal
NULL
+#define arginfo_oci_lob_export
NULL
+#define arginfo_oci_new_descriptor
NULL
+#define arginfo_oci_rollback
NULL
+#define arginfo_oci_commit
NULL
+#define arginfo_oci_field_name
NULL
+#define arginfo_oci_field_size
NULL
+#define arginfo_oci_field_scale
NULL
+#define arginfo_oci_field_precision
NULL
+#define arginfo_oci_field_type
NULL
+#define arginfo_oci_field_type_raw
NULL
+#define arginfo_oci_field_is_null
NULL
+#define arginfo_oci_internal_debug
NULL
+#define arginfo_oci_execute
NULL
+#define arginfo_oci_cancel
NULL
+#define arginfo_oci_fetch
NULL
+#define arginfo_oci_fetch_object
NULL
+#define arginfo_oci_fetch_row
NULL
+#define arginfo_oci_fetch_assoc
NULL
+#define arginfo_oci_fetch_array
NULL
+#define arginfo_oci_free_statement
NULL
+#define arginfo_oci_close
NULL
+#define arginfo_oci_new_connect
NULL
+#define arginfo_oci_connect
NULL
+#define arginfo_oci_pconnect
NULL
+#define arginfo_oci_error
NULL
+#define arginfo_oci_num_fields
NULL
+#define arginfo_oci_parse
NULL
+#define arginfo_oci_set_prefetch
NULL
+#define arginfo_oci_password_change
NULL
+#define arginfo_oci_new_cursor
NULL
+#define arginfo_oci_result
NULL
+#define arginfo_oci_server_version
NULL
+#define arginfo_oci_statement_type
NULL
+#define arginfo_oci_num_rows
NULL
+#define arginfo_oci_free_collection
NULL
+#define arginfo_oci_collection_append NULL
+#define arginfo_oci_collection_element_get NULL
+#define arginfo_oci_collection_assign NULL
+#define arginfo_oci_collection_element_assign NULL
+#define arginfo_oci_collection_size
NULL
+#define arginfo_oci_collection_max
NULL
+#define arginfo_oci_collection_trim
NULL
+#define arginfo_oci_new_collection
NULL
+#define arginfo_oci_lob_size_method
NULL
+#define arginfo_oci_lob_getbuffering_method NULL
+#define arginfo_oci_lob_close_method NULL
+#define arginfo_oci_lob_save_method
NULL
+#define arginfo_oci_lob_import_method NULL
+#define arginfo_oci_lob_read_method
NULL
+#define arginfo_oci_lob_seek_method
NULL
+#define arginfo_oci_lob_write_method NULL
+#define arginfo_oci_lob_append_method NULL
+#define arginfo_oci_lob_truncate_method
NULL
+#define arginfo_oci_lob_erase_method NULL
+#define arginfo_oci_lob_flush_method NULL
+#define arginfo_oci_lob_setbuffering_method NULL
+#define arginfo_oci_lob_export_method NULL
+#define arginfo_oci_lob_write_temporary_method NULL
+#define arginfo_oci_lob_load_method
NULL
+#define arginfo_oci_lob_tell_method
NULL
+#define arginfo_oci_lob_rewind_method NULL
+#define arginfo_oci_lob_eof_method
NULL
+#define arginfo_oci_free_descriptor_method NULL
+#define arginfo_oci_collection_append_method NULL
+#define arginfo_oci_collection_element_get_method NULL
+#define arginfo_oci_collection_assign_method NULL
+#define arginfo_oci_collection_size_method NULL
+#define arginfo_oci_collection_element_assign_method NULL
+#define arginfo_oci_collection_max_method NULL
+#define arginfo_oci_collection_trim_method NULL
+#define arginfo_oci_collection_free_method NULL
+/* }}} */
+#endif /* ZEND_ENGINE_2 */
+
/* {{{ extension function prototypes
*/
PHP_FUNCTION(oci_bind_by_name);
@@ -1207,7 +1311,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.18 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.19 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
