diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:47 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:47 +0100 |
| commit | f57c0b324912ae3fce7940b836e35ca368cbd0ad (patch) | |
| tree | f744fb9c7b2966fa5feb795ce3531ea0a873ddde /ext/mysqlnd | |
| parent | a9a26100b4d77a0a556dd50e44b265bfdec5bdde (diff) | |
| parent | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (diff) | |
| download | php-git-f57c0b324912ae3fce7940b836e35ca368cbd0ad.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 232f2ea43b..9107be966a 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -332,7 +332,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd) #define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v) #if defined(ZTS) && defined(COMPILE_DL_MYSQLND) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 22a60a26ca..193e4767ae 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -360,7 +360,7 @@ zend_module_entry mysqlnd_module_entry = { /* {{{ COMPILE_DL_MYSQLND */ #ifdef COMPILE_DL_MYSQLND #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(mysqlnd) #endif |