cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c

andrey Tue Feb 12 22:05:34 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli.c Log: Fix windows build - VC doesn't like nested macros http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.15&r2=1.72.2.16.2.17.2.16&diff_format=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15 php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.16 --- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15 Tue Feb 12 20:19:21 2008 +++ php-src/ext/mysqli/mysqli.c Tue Feb 12 22:05:34 2008 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli.c,v 1.72.2.16.2.17.2.15 2008/02/12 20:19:21 johannes Exp $ + $Id: mysqli.c,v 1.72.2.16.2.17.2.16 2008/02/12 22:05:34 andrey Exp $ */ #ifdef HAVE_CONFIG_H @@ -781,17 +781,16 @@ 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; }