From aa1772ca7263173ee47af0d83fea866f194757ba Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 31 Jul 2001 05:44:11 +0000 Subject: More TSRMLS_FETCH annihilation --- ext/java/java.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ext/java/java.c') diff --git a/ext/java/java.c b/ext/java/java.c index fd9d77b2ae..be030e3f80 100644 --- a/ext/java/java.c +++ b/ext/java/java.c @@ -592,15 +592,17 @@ int java_set_property_handler /***************************************************************************/ -static void _php_java_destructor(zend_rsrc_list_entry *rsrc) +static void _php_java_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { void *jobject = (void *)rsrc->ptr; - JG_FETCH(); - if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); + + JG_FETCH(); + if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); } #ifdef ZTS -static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) { +static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) +{ memset(java_globals, 0, sizeof(php_java_globals)); } #endif -- cgit v1.2.1