diff options
author | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
commit | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (patch) | |
tree | b7fbafb4113ea150381a9bba7f98f45027e35b0b /sapi/embed/php_embed.c | |
parent | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (diff) | |
parent | a2f4c32eb14221de79009aadaa3da9c3349e3526 (diff) | |
download | php-git-b44cf1a8540d321583a0d83ebca688ebab10d3b0.tar.gz |
Merge branch 'PHP-7.0' into openssl_error_store
Diffstat (limited to 'sapi/embed/php_embed.c')
-rw-r--r-- | sapi/embed/php_embed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 289dc121df..18c2027271 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -34,7 +34,7 @@ const char HARDCODED_INI[] = "max_input_time=-1\n\0"; #if defined(PHP_WIN32) && defined(ZTS) -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif static char* php_embed_read_cookies(void) |