diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/tidy/php_tidy.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/tidy/php_tidy.h')
| -rw-r--r-- | ext/tidy/php_tidy.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h index cd78f37a17..77de84de9c 100644 --- a/ext/tidy/php_tidy.h +++ b/ext/tidy/php_tidy.h @@ -40,7 +40,10 @@ ZEND_BEGIN_MODULE_GLOBALS(tidy) ZEND_END_MODULE_GLOBALS(tidy) #ifdef ZTS -#define TG(v) TSRMG(tidy_globals_id, zend_tidy_globals *, v) +#define TG(v) ZEND_TSRMG(tidy_globals_id, zend_tidy_globals *, v) +#ifdef COMPILE_DL_TIDY +ZEND_TSRMLS_CACHE_EXTERN; +#endif #else #define TG(v) (tidy_globals.v) #endif |