Skip to content

Commit 1ae4a5a

Browse files
committed
switch to the unified globals accessor where appropriate
1 parent aad974a commit 1ae4a5a

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

php_ibase_includes.h

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,10 @@ enum php_interbase_option {
127127
PHP_IBASE_NOWAIT = 256
128128
};
129129

130-
#ifdef ZTS
131-
#else
132-
#endif
130+
#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
133131

134-
#ifdef ZTS
135-
# define IBG(v) ZEND_TSRMG(ibase_globals_id, zend_ibase_globals *, v)
136-
# ifdef COMPILE_DL_INTERBASE
132+
#if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
137133
ZEND_TSRMLS_CACHE_EXTERN();
138-
# endif
139-
#else
140-
#define IBG(v) (ibase_globals.v)
141134
#endif
142135

143136
#define BLOB_ID_LEN 18

0 commit comments

Comments
 (0)