Fix windows build - VC doesn't like nested macros

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 1b1a41dab32402bf4ef14f1fbc02f6f725aa249b..57442136d186b94052e64269834f3b5e0bc52401 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -781,17 +781,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;
 }