tony2001 Fri Jan 12 12:32:15 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ctype php_ctype.h
/php-src/ext/gmp gmp.c php_gmp.h
/php-src/ext/xmlrpc php_xmlrpc.h xmlrpc-epi-php.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/ctype/php_ctype.h?r1=1.12.2.1.2.3&r2=1.12.2.1.2.4&diff_format=u
Index: php-src/ext/ctype/php_ctype.h
diff -u php-src/ext/ctype/php_ctype.h:1.12.2.1.2.3
php-src/ext/ctype/php_ctype.h:1.12.2.1.2.4
--- php-src/ext/ctype/php_ctype.h:1.12.2.1.2.3 Mon Jan 1 09:35:48 2007
+++ php-src/ext/ctype/php_ctype.h Fri Jan 12 12:32:15 2007
@@ -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 @@
#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
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.7&r2=1.49.2.2.2.8&diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.7 php-src/ext/gmp/gmp.c:1.49.2.2.2.8
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.7 Fri Jan 12 12:17:32 2007
+++ php-src/ext/gmp/gmp.c Fri Jan 12 12:32:15 2007
@@ -324,7 +324,7 @@
"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_MSHUTDOWN_FUNCTION
- */
-ZEND_MODULE_SHUTDOWN_D(gmp)
-{
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ ZEND_MINFO_FUNCTION
*/
ZEND_MODULE_INFO_D(gmp)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/php_gmp.h?r1=1.12.2.1.2.2&r2=1.12.2.1.2.3&diff_format=u
Index: php-src/ext/gmp/php_gmp.h
diff -u php-src/ext/gmp/php_gmp.h:1.12.2.1.2.2
php-src/ext/gmp/php_gmp.h:1.12.2.1.2.3
--- php-src/ext/gmp/php_gmp.h:1.12.2.1.2.2 Mon Jan 1 09:36:01 2007
+++ php-src/ext/gmp/php_gmp.h Fri Jan 12 12:32:15 2007
@@ -33,7 +33,6 @@
#endif
ZEND_MODULE_STARTUP_D(gmp);
-ZEND_MODULE_SHUTDOWN_D(gmp);
ZEND_MODULE_DEACTIVATE_D(gmp);
ZEND_MODULE_INFO_D(gmp);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/php_xmlrpc.h?r1=1.11.2.1.2.1&r2=1.11.2.1.2.2&diff_format=u
Index: php-src/ext/xmlrpc/php_xmlrpc.h
diff -u php-src/ext/xmlrpc/php_xmlrpc.h:1.11.2.1.2.1
php-src/ext/xmlrpc/php_xmlrpc.h:1.11.2.1.2.2
--- php-src/ext/xmlrpc/php_xmlrpc.h:1.11.2.1.2.1 Mon Jan 1 09:36:10 2007
+++ php-src/ext/xmlrpc/php_xmlrpc.h Fri Jan 12 12:32:15 2007
@@ -51,14 +51,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlrpc.h,v 1.11.2.1.2.1 2007/01/01 09:36:10 sebastian Exp $ */
+/* $Id: php_xmlrpc.h,v 1.11.2.1.2.2 2007/01/12 12:32:15 tony2001 Exp $ */
#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 @@
#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_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
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.4&r2=1.39.2.5.2.5&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.4
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.5
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.4 Mon Jan 1 09:36:10 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Jan 12 12:32:15 2007
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.4 2007/01/01 09:36:10 sebastian Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.5 2007/01/12 12:32:15 tony2001 Exp $ */
/**********************************************************************
* BUGS: *
@@ -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 @@
"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 @@
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)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
