]> granicus.if.org Git - php/commitdiff
Fix [-Wextra-tokens] warning in MySQLi extension which breaks build
authorGeorge Peter Banyard <girgias@php.net>
Sun, 17 May 2020 23:00:39 +0000 (01:00 +0200)
committerGeorge Peter Banyard <girgias@php.net>
Sun, 17 May 2020 23:00:47 +0000 (01:00 +0200)
Didn't double check and this slipped through with my big search and replace

ext/mysqli/mysqli.c

index 1c56c907ce2b714665e4a690381b200bc81697e5..eb3c79b7985a11686aaf9a2d6095466e035aef58 100644 (file)
@@ -875,7 +875,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
  */
 PHP_RINIT_FUNCTION(mysqli)
 {
-#ifndef MYSQLI_USE_MYSQLND && defined(ZTS)
+#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
        if (mysql_thread_init()) {
                return FAILURE;
        }
@@ -912,7 +912,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
 {
        /* check persistent connections, move used to free */
 
-#ifndef MYSQLI_USE_MYSQLND && defined(ZTS)
+#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
        mysql_thread_end();
 #endif
        if (MyG(error_msg)) {