From: Andrey Hristov <andrey@php.net>
Date: Tue, 12 Feb 2008 22:06:06 +0000 (+0000)
Subject: Fix Windows build. VC doesn't like nested macros - expansion + #if
X-Git-Tag: RELEASE_2_0_0a1~497
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=038a533d65f60bd9586a7c4d15d2c5c571014a5e;p=php

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

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index d898925d27..c6e02f831e 100644
--- 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;
 }