PHP 4.0 Bug #7612 Updated: some compile errors and it's patch

ID: 7612 Updated by: andi Reported By: bushi@mizi.com Status: Closed Bug Type: Compile Failure Assigned To: Comments: We don't maintain the PAM module but I updated swf and gd was already fixed. Can you please grab the latest CVS or snapshot (in a few hours) and see if you still have these problems? Thanks, Previous Comments: --------------------------------------------------------------------------- [2000-11-03 04:19:36] bushi@mizi.com glibc 2.1.2, gcc 2.95.2 sorry my poor english. "#define ZST 1" be inserted into "php_config.h" when configure with "--with-servlet". And, it cause compile errors on some extension modules such as php-pam-0.3.1, swf and gd. ----------------------cut here------------------------------------ --- php-4.0.3pl1/ext/pam/pam.c.orig Sat Nov 4 14:50:07 2000 +++ php-4.0.3pl1/ext/pam/pam.c Sat Nov 4 14:50:15 2000 @@ -774,6 +774,7 @@ { int count; #ifdef ZEND_VERSION + CLS_D; zval *conv_retval, *msg_pval, *resp_pval; zval **args[2]; #else --- php-4.0.3pl1/ext/gd/gd.c.orig Sat Nov 4 12:41:07 2000 +++ php-4.0.3pl1/ext/gd/gd.c Sat Nov 4 12:41:18 2000 @@ -849,6 +849,7 @@ #if HAVE_LIBGD15 zval **dstim, **srcim; gdImagePtr dst, src; + GDLS_FETCH(); if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &dstim, &srcim) == FAILURE) { --- php-4.0.3pl1/ext/swf/php_swf.h.orig Sat Nov 4 15:05:45 2000 +++ php-4.0.3pl1/ext/swf/php_swf.h Sat Nov 4 15:04:27 2000 @@ -106,8 +106,10 @@ } php_swf_globals; #ifdef ZTS +#define SWFLS_D php_swf_globals *swf_globals #define SWFG(v) (swf_globals->v) -#define SWFLS_FETCH() php_swf_globals *swf_globals = ts_resource(gd_swf_id) +#define SWFLS_FETCH() php_swf_globals *swf_globals = ts_resource(swf_globals_id) #else +#define SWFLS_D #define SWFG(v) (swf_globals.v) #define SWFLS_FETCH() --- php-4.0.3pl1/ext/swf/swf.c.orig Sat Nov 4 14:56:51 2000 +++ php-4.0.3pl1/ext/swf/swf.c Sat Nov 4 15:04:55 2000 @@ -31,7 +31,7 @@ #ifdef ZTS int swf_globals_id; #else -php_swf_globals swf_globals; +ZEND_API php_swf_globals swf_globals; #endif @@ -156,6 +156,8 @@ PHP_RINIT_FUNCTION(swf) { + SWFLS_D; + SWFG(use_file) = 0; return SUCCESS; ------------------------cut here--------------------------------------- --------------------------------------------------------------------------- Full Bug description available at: http://bugs.php.net/?id=7612