From a0aa80a3f81516add499b06905e6a7264112eccd Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 16 Oct 2007 20:58:35 +0000 Subject: Sync mysqlnd with HEAD. Same sources as in 5_3 --- ext/mysqlnd/mysqlnd_debug.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'ext/mysqlnd/mysqlnd_debug.h') diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index e60a6d912d..120d74aaa5 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -36,7 +36,7 @@ struct st_mysqlnd_debug_methods enum_func_status (*log_va)(MYSQLND_DEBUG *self, unsigned int line, const char * const file, unsigned int level, const char * type, const char *format, ...); zend_bool (*func_enter)(MYSQLND_DEBUG *self, unsigned int line, const char * const file, - char * func_name, size_t func_name_len); + char * func_name, uint func_name_len); enum_func_status (*func_leave)(MYSQLND_DEBUG *self, unsigned int line, const char * const file); enum_func_status (*close)(MYSQLND_DEBUG *self); enum_func_status (*free)(MYSQLND_DEBUG *self); @@ -91,15 +91,13 @@ char * mysqlnd_get_backtrace(TSRMLS_D); #else -#define DBG_INF(msg) -#define DBG_ERR(msg) -#define DBG_INF_FMT(...) -#define DBG_ERR_FMT(...) - -#define DBG_ENTER(func_name) +static inline void DBG_INF(char *msg) {} +static inline void DBG_ERR(char *msg) {} +static inline void DBG_INF_FMT(char *format, ...) {} +static inline void DBG_ERR_FMT(char *format, ...) {} +static inline void DBG_ENTER(char *func_name) {} #define DBG_RETURN(value) return (value) #define DBG_VOID_RETURN return; - #endif -- cgit v1.2.1