MFH

5 files changed, 4 insertions, 74 deletions

diff --git a/ext/ctype/php_ctype.h b/ext/ctype/php_ctype.h
index ac51c5d09a..615bd72251 100644
--- a/ext/ctype/php_ctype.h
+++ b/ext/ctype/php_ctype.h
@@ -19,9 +19,6 @@
 #ifndef PHP_CTYPE_H
 #define PHP_CTYPE_H
 
-/* You should tweak config.m4 so this symbol (or some else suitable)
-   gets defined.
-*/
 #if HAVE_CTYPE
 
 extern zend_module_entry ctype_module_entry;
@@ -33,21 +30,6 @@ extern zend_module_entry ctype_module_entry;
 #define PHP_CTYPE_API
 #endif
 
-/* 
-  	Declare any global variables you may need between the BEGIN
-	and END macros here:     
-
-ZEND_BEGIN_MODULE_GLOBALS(ctype)
-	int global_variable;
-ZEND_END_MODULE_GLOBALS(ctype)
-*/
-
-#ifdef ZTS
-#define CTYPEG(v) TSRMG(ctype_globals_id, php_ctype_globals *, v)
-#else
-#define CTYPEG(v) (ctype_globals.v)
-#endif
-
 #else
 
 #define phpext_ctype_ptr NULL
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index c3de64d5f6..43edc53d9f 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -324,7 +324,7 @@ zend_module_entry gmp_module_entry = {
 	"gmp",
 	gmp_functions,
 	ZEND_MODULE_STARTUP_N(gmp),
-	ZEND_MODULE_SHUTDOWN_N(gmp),
+	NULL,
 	NULL,
 	ZEND_MODULE_DEACTIVATE_N(gmp),
 	ZEND_MODULE_INFO_N(gmp),
@@ -409,14 +409,6 @@ ZEND_MODULE_DEACTIVATE_D(gmp)
 }
 /* }}} */
 
-/* {{{ ZEND_MSHUTDOWN_FUNCTION
- */
-ZEND_MODULE_SHUTDOWN_D(gmp)
-{
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ ZEND_MINFO_FUNCTION
  */
 ZEND_MODULE_INFO_D(gmp)
diff --git a/ext/gmp/php_gmp.h b/ext/gmp/php_gmp.h
index 11805a3723..22b4abcf48 100644
--- a/ext/gmp/php_gmp.h
+++ b/ext/gmp/php_gmp.h
@@ -33,7 +33,6 @@ extern zend_module_entry gmp_module_entry;
 #endif
 
 ZEND_MODULE_STARTUP_D(gmp);
-ZEND_MODULE_SHUTDOWN_D(gmp);
 ZEND_MODULE_DEACTIVATE_D(gmp);
 ZEND_MODULE_INFO_D(gmp);
 
diff --git a/ext/xmlrpc/php_xmlrpc.h b/ext/xmlrpc/php_xmlrpc.h
index da239cb26f..3c7b39c9af 100644
--- a/ext/xmlrpc/php_xmlrpc.h
+++ b/ext/xmlrpc/php_xmlrpc.h
@@ -56,9 +56,6 @@
 #ifndef _PHP_XMLRPC_H
 #define _PHP_XMLRPC_H
 
-/* You should tweak config.m4 so this symbol (or some else suitable)
-   gets defined.
-*/
 #if 1 /* HAVE_XMLRPC */
 
 extern zend_module_entry xmlrpc_module_entry;
@@ -71,9 +68,6 @@ extern zend_module_entry xmlrpc_module_entry;
 #endif
 
 PHP_MINIT_FUNCTION(xmlrpc);
-PHP_MSHUTDOWN_FUNCTION(xmlrpc);
-PHP_RINIT_FUNCTION(xmlrpc);
-PHP_RSHUTDOWN_FUNCTION(xmlrpc);
 PHP_MINFO_FUNCTION(xmlrpc);
 
 PHP_FUNCTION(xmlrpc_encode);
@@ -91,20 +85,6 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions);
 PHP_FUNCTION(xmlrpc_server_add_introspection_data);
 PHP_FUNCTION(xmlrpc_server_register_introspection_callback);
 
-/* Fill in this structure and use entries in it
-   for thread safety instead of using true globals.
-*/
-typedef struct {
-	int x; /* fix error in msvc, cannot have empty structs */
-} zend_xmlrpc_globals;
-
-/* In every function that needs to use variables in zend_xmlrpc_globals,
-   do call XMLRPCLS_FETCH(); after declaring other variables used by
-   that function, and always refer to them as XMLRPCG(variable).
-   You are encouraged to rename these macros something shorter, see
-   examples in any other php module directory.
-*/
-
 #else
 
 #define phpext_xmlrpc_ptr NULL
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index b1359d8f55..25bbc54a7c 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -73,11 +73,6 @@
 
 #define PHP_EXT_VERSION "0.51"
 
-/* You should tweak config.m4 so this symbol (or some else suitable)
-	gets defined.  */
-
-ZEND_DECLARE_MODULE_GLOBALS(xmlrpc)
-
 static int le_xmlrpc_server;
 
 zend_function_entry xmlrpc_functions[] = {
@@ -103,9 +98,9 @@ zend_module_entry xmlrpc_module_entry = {
 	"xmlrpc",
 	xmlrpc_functions,
 	PHP_MINIT(xmlrpc),
-	PHP_MSHUTDOWN(xmlrpc),
-	PHP_RINIT(xmlrpc),      /* Replace with NULL if there's nothing to do at request start */
-	PHP_RSHUTDOWN(xmlrpc),  /* Replace with NULL if there's nothing to do at request end */
+	NULL,
+	NULL,
+	NULL,
 	PHP_MINFO(xmlrpc),
 	PHP_EXT_VERSION,
 	STANDARD_MODULE_PROPERTIES
@@ -236,24 +231,6 @@ PHP_MINIT_FUNCTION(xmlrpc)
 	return SUCCESS;
 }
 
-/* module shutdown */
-PHP_MSHUTDOWN_FUNCTION(xmlrpc)
-{
-	return SUCCESS;
-}
-
-/* Remove if there's nothing to do at request start */
-PHP_RINIT_FUNCTION(xmlrpc)
-{
-	return SUCCESS;
-}
-
-/* Remove if there's nothing to do at request end */
-PHP_RSHUTDOWN_FUNCTION(xmlrpc)
-{
-	return SUCCESS;
-}
-
 /* display info in phpinfo() */
 PHP_MINFO_FUNCTION(xmlrpc)
 {