Fix Windows build. VC doesn't like nested macros - expansion + #if

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index d898925d27c4733e070b8fb43dc06741c143319b..c6e02f831eb922c5bf77cc305fa27c181a70197b 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -778,17 +778,16 @@ PHP_MINIT_FUNCTION(mysqli)
        REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ALL", MYSQLI_REPORT_ALL, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS | CONST_PERSISTENT);
 
-       REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 
+       /* We use non-nested macros with expansion, as VC has problems */
 #ifdef HAVE_MYSQLND
-       MYSQLND_DBG_ENABLED
+       REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT);
 #else
 #ifndef DBUG_OFF
-       0
+       REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 0, CONST_CS | CONST_PERSISTENT);
 #else
-       1
+       REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS | CONST_PERSISTENT);
 #endif
 #endif
-       , CONST_CS | CONST_PERSISTENT);
 
        return SUCCESS;
 }