diff options
Diffstat (limited to 'ext/ldap/php_ldap.h')
-rw-r--r-- | ext/ldap/php_ldap.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h index eaf2fea64e..f777fe9a5f 100644 --- a/ext/ldap/php_ldap.h +++ b/ext/ldap/php_ldap.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -43,12 +43,13 @@ ZEND_BEGIN_MODULE_GLOBALS(ldap) zend_long max_links; ZEND_END_MODULE_GLOBALS(ldap) -#ifdef ZTS -# define LDAPG(v) TSRMG(ldap_globals_id, zend_ldap_globals *, v) -#else -# define LDAPG(v) (ldap_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_LDAP) +ZEND_TSRMLS_CACHE_EXTERN() #endif +ZEND_EXTERN_MODULE_GLOBALS(ldap) +#define LDAPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ldap, v) + #define phpext_ldap_ptr ldap_module_ptr /* Constants for ldap_modify_batch */ |