Changeset 1321 in svn for trunk/xcache.c

Timestamp:

2013-07-15T17:37:57Z (4 years ago)

Author:

Xuefer

Message:

add back PHP_4 code for disassembler

File:

• trunk/xcache.c (modified) (4 diffs)

trunk/xcache.c

@@ -115 +115 @@
 /* }}} */
 /* {{{ PHP_GINIT_FUNCTION(xcache) */
-#define xcache_globals xcacheglobals
+#pragma GCC push_options
+#pragma GCC diagnostic ignored "-Wshadow"
+
 #ifdef PHP_GINIT_FUNCTION
 static PHP_GINIT_FUNCTION(xcache)
 #else
-static void xc_init_globals(zend_xcache_globals *xcache_globals TSRMLS_DC)
-#endif
-{
+static void xc_init_globals(zend_xcache_globals* xcache_globals TSRMLS_DC)
+#endif
+{
+#pragma GCC pop_options
+
     memset(xcache_globals, 0, sizeof(zend_xcache_globals));
 
@@ -130 +134 @@
     zend_hash_init_ex(&xcache_globals->internal_class_table,    1, NULL, NULL, 1, 0);
 }
-#undef xcache_globals
 /* }}} */
 /* {{{ PHP_GSHUTDOWN_FUNCTION(xcache) */
 static
 #ifdef PHP_GSHUTDOWN_FUNCTION
-#define xcache_globals xcacheglobals
 PHP_GSHUTDOWN_FUNCTION(xcache)
 #else
@@ -169 +171 @@
     }
 }
-#undef xcache_globals
 /* }}} */
 
@@ -885 +886 @@
     PHP_GSHUTDOWN(xcache),
 #endif
+#ifdef ZEND_ENGINE_2
     NULL /* ZEND_MODULE_POST_ZEND_DEACTIVATE_N */,
+#else
+    NULL,
+    NULL,
+#endif
     STANDARD_MODULE_PROPERTIES_EX
 };