diff options
| author | Andrey Hristov <andrey@php.net> | 2008-02-12 22:06:06 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-02-12 22:06:06 +0000 |
| commit | 038a533d65f60bd9586a7c4d15d2c5c571014a5e (patch) | |
| tree | f7f4bce3d890e98bf6b88e756945470a6b702a06 /ext/mysqli/mysqli.c | |
| parent | e55831f370b67ecc640a710d9084ad52a1cf77e4 (diff) | |
| download | php-git-038a533d65f60bd9586a7c4d15d2c5c571014a5e.tar.gz | |
Fix Windows build. VC doesn't like nested macros - expansion + #if
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 9 |
1 files changed, 4 insertions, 5 deletions
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; } |