com php-src: build fixes: ext/mysqlnd/mysqlnd_debug.h
| From: | Andrey Hristov | Date: | Mon, 11 Feb 2013 11:07:10 +0000 |
| Subject: | com php-src: build fixes: ext/mysqlnd/mysqlnd_debug.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71208@lists.php.net to get a copy of this message | ||
Commit: 5bfdf4f069975514a358473f7e7fee3710e50597
Author: Andrey Hristov <andrey@php.net> Mon, 11 Feb 2013 12:07:10 +0100
Parents: 1a954ea616fb361e2f1d94bc4436f7621bcd4c24
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5bfdf4f069975514a358473f7e7fee3710e50597
Log:
build fixes
Changed paths:
M ext/mysqlnd/mysqlnd_debug.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 4bc7278..de0bbae 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -101,12 +101,12 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length
TSRMLS_DC);
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE && (dbg_obj))
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ", __VA_ARGS__); }
while (0)
#define DBG_ERR_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE && (dbg_obj))
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "error: ", __VA_ARGS__); }
while (0)
-#define DBG_BLOCK_ENTER_EX(dbg_obj, block_name) DBG_BLOCK_ENTER_EX2((dbg_obj), NULL, (block_name))
-#define DBG_BLOCK_LEAVE_EX(dbg_obj) DBG_BLOCK_LEAVE_EX2((dbg_obj))
+#define DBG_BLOCK_ENTER_EX(dbg_obj, block_name) DBG_BLOCK_ENTER_EX2((dbg_obj), (MYSQLND_DEBUG *)
NULL, (block_name))
+#define DBG_BLOCK_LEAVE_EX(dbg_obj) DBG_BLOCK_LEAVE_EX2((dbg_obj), (MYSQLND_DEBUG *) NULL)
#define DBG_BLOCK_ENTER_EX2(dbg_obj1, dbg_obj2, block_name) \
{ \
- DBG_ENTER_EX2((dbg_obj1), (db_obj2), (block_name));
+ DBG_ENTER_EX2((dbg_obj1), (dbg_obj2), (block_name));
#define DBG_BLOCK_LEAVE_EX2(dbg_obj1, dbg_obj2) \
DBG_LEAVE_EX2((dbg_obj1), (dbg_obj2), ;) \