diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
| commit | d87cc976e1156b839fc6d4aa6b473a126802b8e3 (patch) | |
| tree | 8acb068dd7458e1c8df3a7d8ecb87d065990fdb1 /ext/swf | |
| parent | b4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (diff) | |
| download | php-git-d87cc976e1156b839fc6d4aa6b473a126802b8e3.tar.gz | |
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'ext/swf')
| -rw-r--r-- | ext/swf/php_swf.h | 6 | ||||
| -rw-r--r-- | ext/swf/swf.c | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/ext/swf/php_swf.h b/ext/swf/php_swf.h index e4bd699761..361f6950d8 100644 --- a/ext/swf/php_swf.h +++ b/ext/swf/php_swf.h @@ -107,13 +107,9 @@ ZEND_BEGIN_MODULE_GLOBALS(swf) ZEND_END_MODULE_GLOBALS(swf) #ifdef ZTS -#define SWFLS_D zend_swf_globals *swf_globals -#define SWFG(v) (swf_globals->v) -#define SWFLS_FETCH() zend_swf_globals *swf_globals = ts_resource(swf_globals_id) +#define SWFG(v) TSRMG(swf_globals_id, zend_swf_globals *, v) #else -#define SWFLS_D #define SWFG(v) (swf_globals.v) -#define SWFLS_FETCH() #endif #else diff --git a/ext/swf/swf.c b/ext/swf/swf.c index ac7e6f3bcb..a33f613773 100644 --- a/ext/swf/swf.c +++ b/ext/swf/swf.c @@ -168,9 +168,7 @@ PHP_MINIT_FUNCTION(swf) */ PHP_RINIT_FUNCTION(swf) { - SWFLS_FETCH(); SWFG(use_file) = 0; - return SUCCESS; } /* }}} */ @@ -182,7 +180,6 @@ PHP_FUNCTION(swf_openfile) zval **name, **sizeX, **sizeY, **frameRate, **r, **g, **b; char *na, *tmpna; zend_bool free_na; - SWFLS_FETCH(); if (ZEND_NUM_ARGS() != 7 || zend_get_parameters_ex(7, &name, &sizeX, &sizeY, &frameRate, &r, &g, &b) == FAILURE) { @@ -245,8 +242,6 @@ PHP_FUNCTION(swf_openfile) Close a Shockwave flash file that was opened with swf_openfile */ PHP_FUNCTION(swf_closefile) { - SWFLS_FETCH(); - swf_closefile(); if (!SWFG(use_file)) { |