From: Pierre Joye <pajoye@php.net>
Date: Sat, 5 Sep 2009 17:39:18 +0000 (+0000)
Subject: - useless #ifdef
X-Git-Tag: php-5.4.0alpha1~191^2~2693
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eaf8bf2226e0dfce1197d612d6b2212849a1bed;p=php

- useless #ifdef
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index b520d9f522..1067d90d32 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -485,11 +485,6 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
 			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 @@ static zval *php_filter_get_storage(long arg TSRMLS_DC)/* {{{ */
 
 {
 	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:
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index fb6a39a54e..43d387a861 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -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