cvs: php4 /ext/swf php_swf.h swf.c

andi Fri Dec 1 01:50:01 2000 EDT Modified files: /php4/ext/swf php_swf.h swf.c Log: - Fix swf build issues from bug #7612 - Not tested! Someone please compile it. Index: php4/ext/swf/php_swf.h diff -u php4/ext/swf/php_swf.h:1.10 php4/ext/swf/php_swf.h:1.11 --- php4/ext/swf/php_swf.h:1.10 Fri Oct 27 12:10:21 2000 +++ php4/ext/swf/php_swf.h Fri Dec 1 01:50:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_swf.h,v 1.10 2000/10/27 19:10:21 sterling Exp $ */ +/* $Id: php_swf.h,v 1.11 2000/12/01 09:50:01 andi Exp $ */ #ifndef PHP_SWF_H #define PHP_SWF_H @@ -100,15 +100,18 @@ PHP_FUNCTION(swf_rotate); PHP_FUNCTION(swf_posround); -typedef struct { + +ZEND_BEGIN_MODULE_GLOBALS(swf) int use_file; char *tmpfile_name; -} php_swf_globals; +ZEND_END_MODULE_GLOBALS(swf) #ifdef ZTS +#define SWFLS_D zend_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() zend_swf_globals *swf_globals = ts_resource(swf_globals_id) #else +#define SWFLS_D #define SWFG(v) (swf_globals.v) #define SWFLS_FETCH() #endif Index: php4/ext/swf/swf.c diff -u php4/ext/swf/swf.c:1.27 php4/ext/swf/swf.c:1.28 --- php4/ext/swf/swf.c:1.27 Fri Oct 27 12:10:21 2000 +++ php4/ext/swf/swf.c Fri Dec 1 01:50:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: swf.c,v 1.27 2000/10/27 19:10:21 sterling Exp $ */ +/* $Id: swf.c,v 1.28 2000/12/01 09:50:01 andi Exp $ */ #include "php.h" @@ -28,12 +28,7 @@ #include "php_open_temporary_file.h" #include "php_swf.h" -#ifdef ZTS -int swf_globals_id; -#else -php_swf_globals swf_globals; -#endif - +ZEND_DECLARE_MODULE_GLOBALS(swf) function_entry swf_functions[] = { PHP_FE(swf_openfile, NULL)