mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-11 10:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restored zip/oci8 PHP 4 code, add PHP 7 checks

Browse Source
This commit is contained in:
Andrea Faulds 2014-12-05 13:41:38 +00:00
parent 8efe343352
commit 8a065c554b
2 changed files with 115 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
ext/oci8/oci8.c
View File

@ -148,6 +148,8 @@ ZEND_GET_MODULE(oci8)
#endif /* COMPILE_DL */
/* }}} */
#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3)
/* {{{ Function arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3)
ZEND_ARG_INFO(0, statement_resource)
@ -643,6 +645,117 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim_method, 0, 0, 1)
ZEND_END_ARG_INFO()
/* }}} */
#else /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
/* {{{ 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_get_implicit_resultset NULL
#define arginfo_oci_set_prefetch NULL
#define arginfo_oci_set_client_identifier NULL
#define arginfo_oci_set_edition NULL
#define arginfo_oci_set_module_name NULL
#define arginfo_oci_set_action NULL
#define arginfo_oci_set_client_info NULL
#ifdef WAITIING_ORACLE_BUG_16695981_FIX
#define arginfo_oci_set_db_operation NULL
#endif
#define arginfo_oci_password_change NULL
#define arginfo_oci_new_cursor NULL
#define arginfo_oci_result NULL
#define arginfo_oci_client_version 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 /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
/* {{{ extension function prototypes
*/

2
ext/zip/zip_stream.c
View File

@ -22,6 +22,7 @@
#endif
#include "php.h"
#if HAVE_ZIP
#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3)
#include "php_streams.h"
#include "ext/standard/file.h"
@ -347,4 +348,5 @@ php_stream_wrapper php_stream_zip_wrapper = {
NULL,
0 /* is_url */
};
#endif /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
#endif /* HAVE_ZIP */