diff options
| author | Daniel Beulshausen <dbeu@php.net> | 2001-09-07 13:53:28 +0000 |
|---|---|---|
| committer | Daniel Beulshausen <dbeu@php.net> | 2001-09-07 13:53:28 +0000 |
| commit | 2da75a405fb00d86f64fc663fb14d808d8ba7784 (patch) | |
| tree | a5934abf6920bc13622d8e0487cbe3997ec865bb | |
| parent | a0acfe437554a03b986325c97aac2c8032ceb098 (diff) | |
| download | php-git-2da75a405fb00d86f64fc663fb14d808d8ba7784.tar.gz | |
build fixes
| -rw-r--r-- | ext/sablot/php_sablot.h | 2 | ||||
| -rw-r--r-- | ext/sablot/sablot.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ext/sablot/php_sablot.h b/ext/sablot/php_sablot.h index 45b28869cc..805fc27ffa 100644 --- a/ext/sablot/php_sablot.h +++ b/ext/sablot/php_sablot.h @@ -119,7 +119,7 @@ ZEND_END_MODULE_GLOBALS(sablot) #ifdef ZTS -#define SABLOTG(v) TSRMG(sablot_globals_id, php_sablot_globals *, v) +#define SABLOTG(v) TSRMG(sablot_globals_id, zend_sablot_globals *, v) #else #define SABLOTG(v) (sablot_globals.v) #endif diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c index f70ba9bb23..bd681486f8 100644 --- a/ext/sablot/sablot.c +++ b/ext/sablot/sablot.c @@ -168,14 +168,14 @@ static SchemeHandler sh = { ZEND_DECLARE_MODULE_GLOBALS(sablot) -static unsigned char sixth_arg_force_ref[] = { 6, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -static unsigned char third_arg_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_NONE }; +static unsigned char a6_arg_force_ref[] = { 6, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +static unsigned char a3_arg_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_NONE }; function_entry sablot_functions[] = { PHP_FE(xslt_output_begintransform, NULL) PHP_FE(xslt_output_endtransform, NULL) - PHP_FE(xslt_transform, sixth_arg_force_ref) - PHP_FE(xslt_process, third_arg_force_ref) + PHP_FE(xslt_transform, a6_arg_force_ref) + PHP_FE(xslt_process, a3_arg_force_ref) PHP_FE(xslt_create, NULL) PHP_FE(xslt_run, NULL) PHP_FE(xslt_fetch_result, NULL) @@ -701,7 +701,6 @@ PHP_FUNCTION(xslt_openlog) int ret = 0, loglevel = 0, argc = ZEND_NUM_ARGS(); - TSRMLS_FETCH(); if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &xh, &logfile, &opt_loglevel) == FAILURE) { @@ -1659,6 +1658,8 @@ static zval *_php_sablot_string_zval(const char *str) static zval *_php_sablot_resource_zval(long value) { zval *ret; + TSRMLS_FETCH(); + MAKE_STD_ZVAL(ret); Z_TYPE_P(ret) = IS_RESOURCE; |