summaryrefslogtreecommitdiff
path: root/ext/interbase/php_ibase_includes.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-07-29 12:26:23 +0200
committerAnatol Belski <ab@php.net>2015-07-29 13:26:35 +0200
commit4e66cce87ce0e57a7394486412e61abcfc5f3520 (patch)
tree74da7597406fcb73d654f193d139c063b3c7093e /ext/interbase/php_ibase_includes.h
parent0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff)
downloadphp-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/interbase/php_ibase_includes.h')
-rw-r--r--ext/interbase/php_ibase_includes.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/interbase/php_ibase_includes.h b/ext/interbase/php_ibase_includes.h
index 03fa6e3cf0..63a61ed4fe 100644
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
@@ -127,17 +127,10 @@ enum php_interbase_option {
PHP_IBASE_NOWAIT = 256
};
-#ifdef ZTS
-#else
-#endif
+#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
-#ifdef ZTS
-# define IBG(v) ZEND_TSRMG(ibase_globals_id, zend_ibase_globals *, v)
-# ifdef COMPILE_DL_INTERBASE
+#if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
ZEND_TSRMLS_CACHE_EXTERN();
-# endif
-#else
-#define IBG(v) (ibase_globals.v)
#endif
#define BLOB_ID_LEN 18