cvs: php4 /ext/sablot php_sablot.h sablot.c

dbeu Fri Sep 7 09:53:31 2001 EDT Modified files: /php4/ext/sablot php_sablot.h sablot.c Log: build fixes Index: php4/ext/sablot/php_sablot.h diff -u php4/ext/sablot/php_sablot.h:1.18 php4/ext/sablot/php_sablot.h:1.19 --- php4/ext/sablot/php_sablot.h:1.18 Fri Aug 10 08:45:58 2001 +++ php4/ext/sablot/php_sablot.h Fri Sep 7 09:53:28 2001 @@ -119,7 +119,7 @@ #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 Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.54 php4/ext/sablot/sablot.c:1.55 --- php4/ext/sablot/sablot.c:1.54 Mon Sep 3 17:54:27 2001 +++ php4/ext/sablot/sablot.c Fri Sep 7 09:53:28 2001 @@ -168,14 +168,14 @@ 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 @@ 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_resource_zval(long value) { zval *ret; + TSRMLS_FETCH(); + MAKE_STD_ZVAL(ret); Z_TYPE_P(ret) = IS_RESOURCE;