svn: /php/php-src/trunk/ext/filter/ filter.c logical_filters.c

pajoye Sat, 05 Sep 2009 17:39:18 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=288084 Log: - useless #ifdef Changed paths: U php/php-src/trunk/ext/filter/filter.c U php/php-src/trunk/ext/filter/logical_filters.c Modified: php/php-src/trunk/ext/filter/filter.c =================================================================== --- php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:35:26 UTC (rev 288083) +++ php/php-src/trunk/ext/filter/filter.c 2009-09-05 17:39:18 UTC (rev 288084) @@ -485,11 +485,6 @@ INIT_PZVAL(tmp_new_var); php_zval_filter(&tmp_new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC); } -#if PHP_VERSION_ID<60000 - else if (PG(magic_quotes_gpc)) { - Z_STRVAL(new_var) = php_addslashes(*val, Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC); - } -#endif else { Z_STRVAL(new_var) = estrndup(*val, val_len); } @@ -554,11 +549,7 @@ { zval *array_ptr = NULL; - zend_bool jit_initialization = (PG(auto_globals_jit) -#if PHP_VERSION_ID<60000 - && !PG(register_globals) && !PG(register_long_arrays) -#endif - ); + zend_bool jit_initialization = (PG(auto_globals_jit)); switch (arg) { case PARSE_GET: Modified: php/php-src/trunk/ext/filter/logical_filters.c =================================================================== --- php/php-src/trunk/ext/filter/logical_filters.c 2009-09-05 17:35:26 UTC (rev 288083) +++ php/php-src/trunk/ext/filter/logical_filters.c 2009-09-05 17:39:18 UTC (rev 288084) @@ -24,10 +24,6 @@ #include "ext/standard/url.h" #include "ext/pcre/php_pcre.h" -#if PHP_MAJOR_VERSION <= 6 -#define zend_ascii_hash_find(hash, name, sizeof_name, val) zend_hash_find(hash, name, sizeof_name, val) -#endif - #include "zend_multiply.h" #if HAVE_ARPA_INET_H