diff options
Diffstat (limited to 'ext/muscat')
| -rw-r--r-- | ext/muscat/muscat.c | 3 | ||||
| -rw-r--r-- | ext/muscat/php_muscat.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c index 89dbf82daf..f7af8bff7a 100644 --- a/ext/muscat/muscat.c +++ b/ext/muscat/muscat.c @@ -271,7 +271,6 @@ PHP_FUNCTION(muscat_give) char *string = NULL; _muscat_handle *handle; int r; - MUSCATLS_FETCH(); if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &Muscat_handle_arg, &string_arg) == FAILURE){ WRONG_PARAM_COUNT; @@ -296,7 +295,6 @@ PHP_FUNCTION(muscat_get) zval **Muscat_handle_arg; _muscat_handle *handle; int r; - MUSCATLS_FETCH(); if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &Muscat_handle_arg) == FAILURE){ WRONG_PARAM_COUNT; @@ -325,7 +323,6 @@ PHP_FUNCTION(muscat_close) { zval **muscat_handle_arg; _muscat_handle *handle; - MUSCATLS_FETCH(); if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &muscat_handle_arg) == FAILURE){ WRONG_PARAM_COUNT; diff --git a/ext/muscat/php_muscat.h b/ext/muscat/php_muscat.h index 4bffeeb27c..7981a6813c 100644 --- a/ext/muscat/php_muscat.h +++ b/ext/muscat/php_muscat.h @@ -75,11 +75,9 @@ ZEND_END_MODULE_GLOBALS(muscat) */ #ifdef ZTS -#define MUSCATG(v) (muscat_globals->v) -#define MUSCATLS_FETCH() php_muscat_globals *muscat_globals = ts_resource(muscat_globals_id) +#define MUSCATG(v) TSRMG(muscat_globals_id, php_muscat_globals *, v) #else #define MUSCATG(v) (muscat_globals.v) -#define MUSCATLS_FETCH() #endif #else |