diff options
| -rw-r--r-- | ext/enchant/php_enchant.h | 6 | ||||
| -rw-r--r-- | ext/fileinfo/php_fileinfo.h | 6 | ||||
| -rw-r--r-- | ext/pdo/pdo.c | 16 | ||||
| -rw-r--r-- | ext/pdo/php_pdo.h | 10 | ||||
| -rw-r--r-- | ext/pdo_odbc/php_pdo_odbc.h | 16 | ||||
| -rw-r--r-- | ext/pdo_sqlite/php_pdo_sqlite.h | 16 | ||||
| -rw-r--r-- | ext/simplexml/php_simplexml.h | 6 | ||||
| -rw-r--r-- | ext/tokenizer/php_tokenizer.h | 6 | ||||
| -rw-r--r-- | ext/xmlreader/php_xmlreader.h | 6 | ||||
| -rw-r--r-- | ext/xsl/php_xsl.h | 17 |
10 files changed, 1 insertions, 104 deletions
diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 1152a96f47..9ba21094a8 100644 --- a/ext/enchant/php_enchant.h +++ b/ext/enchant/php_enchant.h @@ -61,10 +61,4 @@ PHP_FUNCTION(enchant_dict_get_error); PHP_FUNCTION(enchant_dict_describe); PHP_FUNCTION(enchant_dict_quick_check); -#ifdef ZTS -#define ENCHANT_G(v) TSRMG(enchant_globals_id, zend_enchant_globals *, v) -#else -#define ENCHANT_G(v) (enchant_globals.v) -#endif - #endif /* PHP_ENCHANT_H */ diff --git a/ext/fileinfo/php_fileinfo.h b/ext/fileinfo/php_fileinfo.h index 266ecc7596..ac43b21050 100644 --- a/ext/fileinfo/php_fileinfo.h +++ b/ext/fileinfo/php_fileinfo.h @@ -43,10 +43,4 @@ PHP_FUNCTION(finfo_file); PHP_FUNCTION(finfo_buffer); PHP_FUNCTION(mime_content_type); -#ifdef ZTS -#define FILEINFO_G(v) TSRMG(fileinfo_globals_id, zend_fileinfo_globals *, v) -#else -#define FILEINFO_G(v) (fileinfo_globals.v) -#endif - #endif /* PHP_FILEINFO_H */ diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index ddd5a4d1bc..88839bf61f 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -37,9 +37,6 @@ zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce; /* for exceptional circumstances */ zend_class_entry *pdo_exception_ce; -ZEND_DECLARE_MODULE_GLOBALS(pdo) -static PHP_GINIT_FUNCTION(pdo); - /* True global resources - no need for thread safety here */ /* the registry of PDO drivers */ @@ -132,11 +129,7 @@ zend_module_entry pdo_module_entry = { NULL, PHP_MINFO(pdo), PHP_PDO_VERSION, - PHP_MODULE_GLOBALS(pdo), - PHP_GINIT(pdo), - NULL, - NULL, - STANDARD_MODULE_PROPERTIES_EX + STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -147,13 +140,6 @@ zend_module_entry pdo_module_entry = { ZEND_GET_MODULE(pdo) #endif -/* {{{ PHP_GINIT_FUNCTION */ -static PHP_GINIT_FUNCTION(pdo) -{ - pdo_globals->global_value = 0; -} -/* }}} */ - PDO_API int php_pdo_register_driver(const pdo_driver_t *driver) /* {{{ */ { if (driver->api_version != PDO_DRIVER_API) { diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h index 50d38dba8f..27c9c984d6 100644 --- a/ext/pdo/php_pdo.h +++ b/ext/pdo/php_pdo.h @@ -49,16 +49,6 @@ PHP_MINIT_FUNCTION(pdo); PHP_MSHUTDOWN_FUNCTION(pdo); PHP_MINFO_FUNCTION(pdo); -ZEND_BEGIN_MODULE_GLOBALS(pdo) - zend_long global_value; -ZEND_END_MODULE_GLOBALS(pdo) - -#ifdef ZTS -# define PDOG(v) TSRMG(pdo_globals_id, zend_pdo_globals *, v) -#else -# define PDOG(v) (pdo_globals.v) -#endif - #define REGISTER_PDO_CLASS_CONST_LONG(const_name, value) \ zend_declare_class_constant_long(php_pdo_get_dbh_ce(), const_name, sizeof(const_name)-1, (zend_long)value); diff --git a/ext/pdo_odbc/php_pdo_odbc.h b/ext/pdo_odbc/php_pdo_odbc.h index 10a11d56a4..9cc748715e 100644 --- a/ext/pdo_odbc/php_pdo_odbc.h +++ b/ext/pdo_odbc/php_pdo_odbc.h @@ -35,20 +35,4 @@ PHP_RINIT_FUNCTION(pdo_odbc); PHP_RSHUTDOWN_FUNCTION(pdo_odbc); PHP_MINFO_FUNCTION(pdo_odbc); -/* - Declare any global variables you may need between the BEGIN - and END macros here: - -ZEND_BEGIN_MODULE_GLOBALS(pdo_odbc) - long global_value; - char *global_string; -ZEND_END_MODULE_GLOBALS(pdo_odbc) -*/ - -#ifdef ZTS -#define PDO_ODBC_G(v) TSRMG(pdo_odbc_globals_id, zend_pdo_odbc_globals *, v) -#else -#define PDO_ODBC_G(v) (pdo_odbc_globals.v) -#endif - #endif /* PHP_PDO_ODBC_H */ diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h index 294a85f41c..73d8a98675 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -35,20 +35,4 @@ PHP_RINIT_FUNCTION(pdo_sqlite); PHP_RSHUTDOWN_FUNCTION(pdo_sqlite); PHP_MINFO_FUNCTION(pdo_sqlite); -/* - Declare any global variables you may need between the BEGIN - and END macros here: - -ZEND_BEGIN_MODULE_GLOBALS(pdo_sqlite) - long global_value; - char *global_string; -ZEND_END_MODULE_GLOBALS(pdo_sqlite) -*/ - -#ifdef ZTS -#define PDO_SQLITE_G(v) TSRMG(pdo_sqlite_globals_id, zend_pdo_sqlite_globals *, v) -#else -#define PDO_SQLITE_G(v) (pdo_sqlite_globals.v) -#endif - #endif /* PHP_PDO_SQLITE_H */ diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h index c3c3c2f1b3..09752229ac 100644 --- a/ext/simplexml/php_simplexml.h +++ b/ext/simplexml/php_simplexml.h @@ -69,12 +69,6 @@ typedef struct { zend_object zo; } php_sxe_object; -#ifdef ZTS -#define SIMPLEXML_G(v) TSRMG(simplexml_globals_id, zend_simplexml_globals *, v) -#else -#define SIMPLEXML_G(v) (simplexml_globals.v) -#endif - #ifdef PHP_WIN32 # ifdef PHP_SIMPLEXML_EXPORTS # define PHP_SXE_API __declspec(dllexport) diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h index 8e3bf05dd5..f6b431d038 100644 --- a/ext/tokenizer/php_tokenizer.h +++ b/ext/tokenizer/php_tokenizer.h @@ -39,10 +39,4 @@ PHP_MINFO_FUNCTION(tokenizer); PHP_FUNCTION(token_get_all); PHP_FUNCTION(token_name); -#ifdef ZTS -#define TOKENIZER_G(v) TSRMG(tokenizer_globals_id, zend_tokenizer_globals *, v) -#else -#define TOKENIZER_G(v) (tokenizer_globals.v) -#endif - #endif /* PHP_TOKENIZER_H */ diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h index d43d332cf5..6c7802224a 100644 --- a/ext/xmlreader/php_xmlreader.h +++ b/ext/xmlreader/php_xmlreader.h @@ -62,10 +62,4 @@ PHP_MINFO_FUNCTION(xmlreader); #define REGISTER_XMLREADER_CLASS_CONST_LONG(const_name, value) \ zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (zend_long)value); -#ifdef ZTS -#define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v) -#else -#define XMLREADER_G(v) (xmlreader_globals.v) -#endif - #endif /* PHP_XMLREADER_H */ diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h index 468238c4f7..6cbf2872b3 100644 --- a/ext/xsl/php_xsl.h +++ b/ext/xsl/php_xsl.h @@ -102,21 +102,4 @@ PHP_RINIT_FUNCTION(xsl); PHP_RSHUTDOWN_FUNCTION(xsl); PHP_MINFO_FUNCTION(xsl); - -/* - Declare any global variables you may need between the BEGIN - and END macros here: - -ZEND_BEGIN_MODULE_GLOBALS(xsl) - long global_value; - char *global_string; -ZEND_END_MODULE_GLOBALS(xsl) -*/ - -#ifdef ZTS -#define XSL_G(v) TSRMG(xsl_globals_id, zend_xsl_globals *, v) -#else -#define XSL_G(v) (xsl_globals.v) -#endif - #endif /* PHP_XSL_H */ |