diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-12-05 19:47:27 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-12-05 19:47:27 +0000 |
| commit | 150dc69d6eee35738f505e925ee664c02060196d (patch) | |
| tree | 664da78135d718a55dce28370a9c1de86a8aace9 /ext/mysql/php_mysql.c | |
| parent | b7251a89dae88aa5d97b1cac93aee8e79ccbfd1c (diff) | |
| parent | 8a065c554be63154125ef2bdd33e350d17a3f26f (diff) | |
| download | php-git-150dc69d6eee35738f505e925ee664c02060196d.tar.gz | |
Merge branch 'ZendEngine3'
* ZendEngine3:
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index fc1dac5da7..4fcc9ca83a 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -35,13 +35,7 @@ #include "ext/standard/php_string.h" #include "ext/standard/basic_functions.h" -#ifdef ZEND_ENGINE_2 -# include "zend_exceptions.h" -#else - /* PHP 4 compat */ -# define OnUpdateLong OnUpdateInt -# define E_STRICT E_NOTICE -#endif +#include "zend_exceptions.h" #if HAVE_MYSQL @@ -2075,7 +2069,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_ mysql_row_length_type *mysql_row_lengths; #endif -#ifdef ZEND_ENGINE_2 if (into_object) { zend_string *class_name = NULL; @@ -2094,7 +2087,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_ } result_type = MYSQL_ASSOC; } else -#endif { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { return; @@ -2162,7 +2154,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_ mysqlnd_fetch_into(mysql_result, ((result_type & MYSQL_NUM)? MYSQLND_FETCH_NUM:0) | ((result_type & MYSQL_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value, MYSQLND_MYSQL); #endif -#ifdef ZEND_ENGINE_2 /* mysqlnd might return FALSE if no more rows */ if (into_object && Z_TYPE_P(return_value) != IS_FALSE) { zval dataset; @@ -2225,7 +2216,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_ zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name->val); } } -#endif } /* }}} */ |