helly Tue Jul 18 23:52:10 2006 UTC
Modified files:
/php-src/ext/filter filter.c php_filter.h
Log:
- Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52 php-src/ext/filter/filter.c:1.53
--- php-src/ext/filter/filter.c:1.52 Thu Jun 22 10:58:13 2006
+++ php-src/ext/filter/filter.c Tue Jul 18 23:52:09 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52 2006/06/22 10:58:13 pajoye Exp $ */
+/* $Id: filter.c,v 1.53 2006/07/18 23:52:09 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.53 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -425,7 +425,11 @@
static zval * php_filter_get_storage(long arg TSRMLS_DC) /* {{{ */
{
zval * array_ptr = NULL;
- zend_bool jit_initialization = (PG(auto_globals_jit) &&
!PG(register_globals) && !PG(register_long_arrays));
+ zend_bool jit_initialization = (PG(auto_globals_jit)
+#if PHP_MAJOR_VERSION < 6
+ && !PG(register_globals) && !PG(register_long_arrays)
+#endif
+ );
switch (arg) {
case PARSE_GET:
array_ptr = IF_G(get_array);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/php_filter.h?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/filter/php_filter.h
diff -u php-src/ext/filter/php_filter.h:1.10
php-src/ext/filter/php_filter.h:1.11
--- php-src/ext/filter/php_filter.h:1.10 Mon May 8 14:39:57 2006
+++ php-src/ext/filter/php_filter.h Tue Jul 18 23:52:09 2006
@@ -17,18 +17,18 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_filter.h,v 1.10 2006/05/08 14:39:57 pajoye Exp $ */
+/* $Id: php_filter.h,v 1.11 2006/07/18 23:52:09 helly Exp $ */
#ifndef PHP_FILTER_H
#define PHP_FILTER_H
-#include "SAPI.h"
-#include "zend_API.h"
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
#include "php_variables.h"
+#include "SAPI.h"
+#include "zend_API.h"
extern zend_module_entry filter_module_entry;
#define phpext_filter_ptr &filter_module_entry
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
