diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:36:21 -0400 |
| commit | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (patch) | |
| tree | b38e2e5c6974b9a15f103e5cf884cba9fff90ef4 /ext/tokenizer | |
| parent | a88a88d0986a4a32288c102cdbfebd78d7e91d99 (diff) | |
| download | php-upstream/5.2.0.tar.gz | |
Imported Upstream version 5.2.0upstream/5.2.0
Diffstat (limited to 'ext/tokenizer')
| -rw-r--r-- | ext/tokenizer/php_tokenizer.h | 5 | ||||
| -rw-r--r-- | ext/tokenizer/tokenizer.c | 42 |
2 files changed, 7 insertions, 40 deletions
diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h index 3964c91b9..3cc5ee704 100644 --- a/ext/tokenizer/php_tokenizer.h +++ b/ext/tokenizer/php_tokenizer.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_tokenizer.h,v 1.9.2.1 2006/01/01 12:50:16 sniper Exp $ */ +/* $Id: php_tokenizer.h,v 1.9.2.1.2.1 2006/06/20 22:39:15 iliaa Exp $ */ #ifndef PHP_TOKENIZER_H #define PHP_TOKENIZER_H @@ -35,9 +35,6 @@ extern zend_module_entry tokenizer_module_entry; #endif PHP_MINIT_FUNCTION(tokenizer); -PHP_MSHUTDOWN_FUNCTION(tokenizer); -PHP_RINIT_FUNCTION(tokenizer); -PHP_RSHUTDOWN_FUNCTION(tokenizer); PHP_MINFO_FUNCTION(tokenizer); PHP_FUNCTION(confirm_tokenizer_compiled); /* For testing, remove later. */ diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 67b8c1a52..4d450c0d1 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tokenizer.c,v 1.31.2.5 2006/01/01 12:50:16 sniper Exp $ */ +/* $Id: tokenizer.c,v 1.31.2.5.2.2 2006/06/20 22:39:15 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -119,9 +119,9 @@ zend_module_entry tokenizer_module_entry = { "tokenizer", tokenizer_functions, PHP_MINIT(tokenizer), - PHP_MSHUTDOWN(tokenizer), - PHP_RINIT(tokenizer), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(tokenizer), /* Replace with NULL if there's nothing to do at request end */ + NULL, + NULL, + NULL, PHP_MINFO(tokenizer), #if ZEND_MODULE_API_NO >= 20010901 "0.1", /* Replace with version number for your extension */ @@ -144,10 +144,10 @@ PHP_INI_END() */ /* }}} */ -/* {{{ php_tokenizer_init_globals +/* {{{ PHP_GINIT_FUNCTION */ /* Uncomment this function if you have INI entries -static void php_tokenizer_init_globals(zend_tokenizer_globals *tokenizer_globals) +static PHP_GINIT_FUNCTION(tokenizer) { tokenizer_globals->global_value = 0; tokenizer_globals->global_string = NULL; @@ -160,7 +160,6 @@ static void php_tokenizer_init_globals(zend_tokenizer_globals *tokenizer_globals PHP_MINIT_FUNCTION(tokenizer) { /* If you have INI entries, uncomment these lines - ZEND_INIT_MODULE_GLOBALS(tokenizer, php_tokenizer_init_globals, NULL); REGISTER_INI_ENTRIES(); */ @@ -288,35 +287,6 @@ PHP_MINIT_FUNCTION(tokenizer) } /* }}} */ -/* {{{ PHP_MSHUTDOWN_FUNCTION - */ -PHP_MSHUTDOWN_FUNCTION(tokenizer) -{ - /* uncomment this line if you have INI entries - UNREGISTER_INI_ENTRIES(); - */ - return SUCCESS; -} -/* }}} */ - -/* Remove if there's nothing to do at request start */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(tokenizer) -{ - return SUCCESS; -} -/* }}} */ - -/* Remove if there's nothing to do at request end */ -/* {{{ PHP_RSHUTDOWN_FUNCTION - */ -PHP_RSHUTDOWN_FUNCTION(tokenizer) -{ - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_MINFO_FUNCTION */ PHP_MINFO_FUNCTION(tokenizer) |