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/mysqli | |
| parent | a9a26100b4d77a0a556dd50e44b265bfdec5bdde (diff) | |
| parent | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (diff) | |
| download | php-git-f57c0b324912ae3fce7940b836e35ca368cbd0ad.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index d6282b8126..e55fab6bb2 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1024,7 +1024,7 @@ zend_module_entry mysqli_module_entry = { #ifdef COMPILE_DL_MYSQLI #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(mysqli) #endif diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 7bfffa83c8..c75023c3ad 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -341,7 +341,7 @@ ZEND_END_MODULE_GLOBALS(mysqli) #define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v) #if defined(ZTS) && defined(COMPILE_DL_MYSQLI) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif #define my_estrdup(x) (x) ? estrdup(x) : NULL |