andrey Tue Feb 12 22:06:06 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
Fix Windows build. VC doesn't like nested macros - expansion + #if
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.121&r2=1.122&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.121 php-src/ext/mysqli/mysqli.c:1.122
--- php-src/ext/mysqli/mysqli.c:1.121 Tue Feb 12 20:18:56 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 22:06:06 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.121 2008/02/12 20:18:56 johannes Exp $
+ $Id: mysqli.c,v 1.122 2008/02/12 22:06:06 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -778,17 +778,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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
