archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

first stone on using the unified globals accessor

Browse source
This commit is contained in:
Anatol Belski 2015-07-29 10:35:57 +02:00
parent 43cdfd9a82
commit 0787cd60ed
4 changed files with 5 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/date/php_date.h
View file

@ -202,11 +202,7 @@ ZEND_BEGIN_MODULE_GLOBALS(date)
int timezone_valid; int timezone_valid;
ZEND_END_MODULE_GLOBALS(date) ZEND_END_MODULE_GLOBALS(date)
#ifdef ZTS #define DATEG(v) ZEND_MODULE_GLOBALS_ACCESSOR(date, v)
#define DATEG(v) ZEND_TSRMG(date_globals_id, zend_date_globals *, v)
#else
#define DATEG(v) (date_globals.v)
#endif
/* Backwards compatibility wrapper */ /* Backwards compatibility wrapper */
PHPAPI zend_long php_parse_date(char *string, zend_long *now); PHPAPI zend_long php_parse_date(char *string, zend_long *now);

7
ext/pcre/php_pcre.h
View file

@ -82,12 +82,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre)
ZEND_END_MODULE_GLOBALS(pcre) ZEND_END_MODULE_GLOBALS(pcre)
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre); PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre);
#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v)
#ifdef ZTS
# define PCRE_G(v) ZEND_TSRMG(pcre_globals_id, zend_pcre_globals *, v)
#else
# define PCRE_G(v) (pcre_globals.v)
#endif
#else #else

9
ext/spl/php_spl.h
View file

@ -68,13 +68,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
int autoload_running; int autoload_running;
ZEND_END_MODULE_GLOBALS(spl) ZEND_END_MODULE_GLOBALS(spl)
#ifdef ZTS ZEND_EXTERN_MODULE_GLOBALS(spl);
# define SPL_G(v) ZEND_TSRMG(spl_globals_id, zend_spl_globals *, v) #define SPL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(spl, v)
extern int spl_globals_id;
#else
# define SPL_G(v) (spl_globals.v)
extern zend_spl_globals spl_globals;
#endif
PHP_FUNCTION(spl_classes); PHP_FUNCTION(spl_classes);
PHP_FUNCTION(class_parents); PHP_FUNCTION(class_parents);

7
ext/standard/browscap.c
View file

@ -44,12 +44,7 @@ ZEND_BEGIN_MODULE_GLOBALS(browscap)
ZEND_END_MODULE_GLOBALS(browscap) ZEND_END_MODULE_GLOBALS(browscap)
ZEND_DECLARE_MODULE_GLOBALS(browscap) ZEND_DECLARE_MODULE_GLOBALS(browscap)
#define BROWSCAP_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(browscap, v)
#ifdef ZTS
#define BROWSCAP_G(v) ZEND_TSRMG(browscap_globals_id, zend_browscap_globals *, v)
#else
#define BROWSCAP_G(v) (browscap_globals.v)
#endif
#define DEFAULT_SECTION_NAME "Default Browser Capability Settings" #define DEFAULT_SECTION_NAME "Default Browser Capability Settings"