fmk Wed Jan 7 19:03:55 2004 EDT
Modified files:
/php-src/ext/tidy php_tidy.h tidy.c
Log:
Fix ZTS build
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.14 php-src/ext/tidy/php_tidy.h:1.15
--- php-src/ext/tidy/php_tidy.h:1.14 Tue Jan 6 13:24:17 2004
+++ php-src/ext/tidy/php_tidy.h Wed Jan 7 19:03:54 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_tidy.h,v 1.14 2004/01/06 18:24:17 john Exp $ */
+/* $Id: php_tidy.h,v 1.15 2004/01/08 00:03:54 fmk Exp $ */
#ifndef PHP_TIDY_H
#define PHP_TIDY_H
@@ -213,8 +213,8 @@
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);
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.29 php-src/ext/tidy/tidy.c:1.30
--- php-src/ext/tidy/tidy.c:1.29 Tue Jan 6 17:23:36 2004
+++ php-src/ext/tidy/tidy.c Wed Jan 7 19:03:54 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.29 2004/01/06 22:23:36 sniper Exp $ */
+/* $Id: tidy.c,v 1.30 2004/01/08 00:03:54 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -178,7 +178,7 @@
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_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 @@
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 @@
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 @@
}
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) {
@@ -807,7 +811,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Library Version", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.29 2004/01/06 22:23:36 sniper Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.30 2004/01/08 00:03:54 fmk Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -896,7 +900,7 @@
}
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 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
