From: George Peter Banyard <girgias@php.net>
Date: Sun, 17 May 2020 23:00:39 +0000 (+0200)
Subject: Fix [-Wextra-tokens] warning in MySQLi extension which breaks build
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c33644fedbb44b8c671311a7f49f9e280b82249;p=php

Fix [-Wextra-tokens] warning in MySQLi extension which breaks build

Didn't double check and this slipped through with my big search and replace
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 1c56c907ce..eb3c79b798 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -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)) {