andrey Fri, 22 Oct 2010 14:12:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304622
Log:
enable debug logging on windows, in debug builds, of course
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h 2010-10-22
14:08:30 UTC (rev 304621)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h 2010-10-22
14:12:45 UTC (rev 304622)
@@ -63,7 +63,8 @@
PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length
TSRMLS_DC);
-#if defined(__GNUC__)
+/* Variadic Macros were introduced in VC 2005, which is _MSC_VER 1400 */
+#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-22 14:08:30 UTC
(rev 304621)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-22 14:12:45 UTC
(rev 304622)
@@ -63,7 +63,8 @@
PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length
TSRMLS_DC);
-#if defined(__GNUC__)
+/* Variadic Macros were introduced in VC 2005, which is _MSC_VER 1400 */
+#if defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1400)
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
