diff options
| -rw-r--r-- | ext/ctype/ctype.c | 10 | ||||
| -rw-r--r-- | ext/gmp/gmp.c | 4 | ||||
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 35 | ||||
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 5 | ||||
| -rw-r--r-- | ext/xsl/php_xsl.c | 17 |
5 files changed, 2 insertions, 69 deletions
diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index a08a0b82b0..050150fe17 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -28,18 +28,8 @@ #include <ctype.h> -/* You should tweak config.m4 so this symbol (or some else suitable) - gets defined. -*/ #if HAVE_CTYPE -/* If you declare any globals in php_ctype.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(ctype) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_ctype; */ - static PHP_MINFO_FUNCTION(ctype); static PHP_FUNCTION(ctype_alnum); diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 5076d3d439..a6b0828af7 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -424,10 +424,6 @@ ZEND_MODULE_INFO_D(gmp) php_info_print_table_start(); php_info_print_table_row(2, "gmp support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 5364c945dc..95b009a105 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -92,12 +92,6 @@ struct yy_buffer_state #define zendtext LANG_SCNG(yy_text) #define zendleng LANG_SCNG(yy_leng) -/* If you declare any globals in php_tokenizer.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(tokenizer) -*/ - -/* True global resources - no need for thread safety here */ -/* static int le_tokenizer; */ /* {{{ tokenizer_functions[] * @@ -134,35 +128,10 @@ zend_module_entry tokenizer_module_entry = { ZEND_GET_MODULE(tokenizer) #endif -/* {{{ PHP_INI - */ -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("tokenizer.global_value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_tokenizer_globals, tokenizer_globals) - STD_PHP_INI_ENTRY("tokenizer.global_string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_tokenizer_globals, tokenizer_globals) -PHP_INI_END() -*/ -/* }}} */ - -/* {{{ PHP_GINIT_FUNCTION - */ -/* Uncomment this function if you have INI entries -static PHP_GINIT_FUNCTION(tokenizer) -{ - tokenizer_globals->global_value = 0; - tokenizer_globals->global_string = NULL; -} -*/ -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(tokenizer) { - /* If you have INI entries, uncomment these lines - REGISTER_INI_ENTRIES(); - */ - REGISTER_LONG_CONSTANT("T_INCLUDE", T_INCLUDE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_INCLUDE_ONCE", T_INCLUDE_ONCE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("T_EVAL", T_EVAL, CONST_CS | CONST_PERSISTENT); @@ -294,10 +263,6 @@ PHP_MINFO_FUNCTION(tokenizer) php_info_print_table_start(); php_info_print_table_row(2, "Tokenizer Support", "enabled"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 5856c1fd9a..e1012ccb0d 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -1304,7 +1304,6 @@ PHP_MINIT_FUNCTION(xmlreader) } /* }}} */ - /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xmlreader) @@ -1323,10 +1322,6 @@ PHP_MINFO_FUNCTION(xmlreader) php_info_print_table_row(2, "XMLReader", "enabled"); } php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index ae1a2d4a8a..7d4f83989d 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -28,9 +28,6 @@ #include "php_xsl.h" -/* If you declare any globals in php_xsl.h uncomment this: -ZEND_DECLARE_MODULE_GLOBALS(xsl) -*/ zend_class_entry *xsl_xsltprocessor_class_entry; static zend_object_handlers xsl_object_handlers; @@ -251,10 +248,6 @@ zval *php_xsl_create_object(xsltStylesheetPtr obj, int *found, zval *wrapper_in, */ PHP_MSHUTDOWN_FUNCTION(xsl) { - /* uncomment this line if you have INI entries - UNREGISTER_INI_ENTRIES(); - */ - xsltUnregisterExtModuleFunction ((const xmlChar *) "functionString", (const xmlChar *) "http://php.net/xsl"); xsltUnregisterExtModuleFunction ((const xmlChar *) "function", @@ -266,7 +259,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl) } /* }}} */ -/* Remove if there's nothing to do at request start */ /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(xsl) @@ -276,7 +268,6 @@ PHP_RINIT_FUNCTION(xsl) } /* }}} */ -/* Remove if there's nothing to do at request end */ /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(xsl) @@ -308,14 +299,10 @@ PHP_MINFO_FUNCTION(xsl) php_info_print_table_row(2, "libxslt compiled against libxml Version", buffer); } #if HAVE_XSL_EXSLT - php_info_print_table_row(2, "EXSLT", "enabled"); - php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); + php_info_print_table_row(2, "EXSLT", "enabled"); + php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); #endif php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } /* }}} */ |