diff options
| author | Frank M. Kromann <fmk@php.net> | 2004-01-08 00:03:54 +0000 |
|---|---|---|
| committer | Frank M. Kromann <fmk@php.net> | 2004-01-08 00:03:54 +0000 |
| commit | 64e404229b9559d10de30c59fc6d7d70f5290cab (patch) | |
| tree | a8329eb199e3c9b0b5f13b7fcbd20bee2d756c15 | |
| parent | 4db2d84efa321f5fbce642f68a4db16365ac7bca (diff) | |
| download | php-git-64e404229b9559d10de30c59fc6d7d70f5290cab.tar.gz | |
Fix ZTS build
| -rw-r--r-- | ext/tidy/php_tidy.h | 4 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index 3dbb6a7d97..969769a490 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -213,8 +213,8 @@ static void tidy_doc_update_properties(PHPTidyObj * TSRMLS_DC); static void tidy_add_default_properties(PHPTidyObj *, tidy_obj_type TSRMLS_DC); static void *php_tidy_get_opt_val(PHPTidyDoc *, TidyOption, TidyOptionType * TSRMLS_DC); static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetypes); -static int _php_tidy_set_tidy_opt(TidyDoc, char *, zval *); -static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options); +static int _php_tidy_set_tidy_opt(TidyDoc, char *, zval * TSRMLS_DC); +static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options TSRMLS_DC); void _php_tidy_register_nodetypes(INIT_FUNC_ARGS); void _php_tidy_register_tags(INIT_FUNC_ARGS); diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index eac7cdc848..c1db1da4d8 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -178,7 +178,7 @@ void php_tidy_panic(ctmbstr msg) zend_error(E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg); } -static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value) +static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value TSRMLS_DC) { TidyOption opt; @@ -524,6 +524,10 @@ static void tidy_globals_ctor(zend_tidy_globals *g TSRMLS_DC) { } +static void tidy_globals_dtor(zend_tidy_globals *g TSRMLS_DC) +{ +} + static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type TSRMLS_DC) { @@ -682,7 +686,7 @@ static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetyp tidy_add_default_properties(newobj, is_node TSRMLS_CC); } -static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options) +static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options TSRMLS_DC) { char *opt_name; zval **opt_val; @@ -696,7 +700,7 @@ static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not retrieve key from array"); } - _php_tidy_set_tidy_opt(doc, opt_name, *opt_val); + _php_tidy_set_tidy_opt(doc, opt_name, *opt_val TSRMLS_CC); } @@ -738,7 +742,7 @@ static void php_tidy_parse_file(INTERNAL_FUNCTION_PARAMETERS) } if(options) { - _php_tidy_apply_config_array(obj->ptdoc->doc, HASH_OF(options)); + _php_tidy_apply_config_array(obj->ptdoc->doc, HASH_OF(options) TSRMLS_CC); } if (tidyParseString(obj->ptdoc->doc, contents) < 0) { @@ -896,7 +900,7 @@ PHP_FUNCTION(tidy_parse_string) } if(options) { - _php_tidy_apply_config_array(obj->ptdoc->doc, HASH_OF(options)); + _php_tidy_apply_config_array(obj->ptdoc->doc, HASH_OF(options) TSRMLS_CC); } if (tidyParseString(obj->ptdoc->doc, input) < 0) { @@ -1323,7 +1327,7 @@ PHP_FUNCTION(tidy_setopt) obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); - if(_php_tidy_set_tidy_opt(obj->ptdoc->doc, optname, value) == SUCCESS) { + if(_php_tidy_set_tidy_opt(obj->ptdoc->doc, optname, value TSRMLS_CC) == SUCCESS) { RETURN_TRUE; } |