diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /sapi/embed/php_embed.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'sapi/embed/php_embed.h')
| -rw-r--r-- | sapi/embed/php_embed.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h index b62fd9fe24..82afa686d2 100644 --- a/sapi/embed/php_embed.h +++ b/sapi/embed/php_embed.h @@ -27,34 +27,15 @@ #include <main/php_ini.h> #include <zend_ini.h> -#ifdef ZTS -#define PTSRMLS_D void ****ptsrm_ls -#define PTSRMLS_DC , PTSRMLS_D -#define PTSRMLS_C &tsrm_ls -#define PTSRMLS_CC , PTSRMLS_C - -#define PHP_EMBED_START_BLOCK(x,y) { \ - void ***tsrm_ls; \ - php_embed_init(x, y PTSRMLS_CC); \ - zend_first_try { - -#else -#define PTSRMLS_D -#define PTSRMLS_DC -#define PTSRMLS_C -#define PTSRMLS_CC - #define PHP_EMBED_START_BLOCK(x,y) { \ php_embed_init(x, y); \ zend_first_try { -#endif - #define PHP_EMBED_END_BLOCK() \ } zend_catch { \ /* int exit_status = EG(exit_status); */ \ } zend_end_try(); \ - php_embed_shutdown(TSRMLS_C); \ + php_embed_shutdown(); \ } #ifndef PHP_WIN32 @@ -63,9 +44,13 @@ #define EMBED_SAPI_API #endif +#ifdef ZTS +ZEND_TSRMLS_CACHE_EXTERN; +#endif + BEGIN_EXTERN_C() -EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC); -EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D); +EMBED_SAPI_API int php_embed_init(int argc, char **argv); +EMBED_SAPI_API void php_embed_shutdown(void); extern EMBED_SAPI_API sapi_module_struct php_embed_module; END_EXTERN_C() |