From: Tilghman Lesher Date: Mon, 30 Nov 2009 20:58:33 +0000 (+0000) Subject: Turn off debug mode in 1.6.1; fix such that debug mode and non-debug mode functions... X-Git-Tag: 1.6.1.12-rc1~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f3ad606ed5bf1c70ef02383388e8d1fb1a443d;p=thirdparty%2Fasterisk.git Turn off debug mode in 1.6.1; fix such that debug mode and non-debug mode functions return the same types. (Fixes an issue brought up in chat by twilson) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@231608 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_queue.c b/apps/app_queue.c index 1da1e6a7b7..26bae613a3 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -95,7 +95,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/global_datastores.h" #include "asterisk/taskprocessor.h" -#define REF_DEBUG_ONLY_QUEUES +/* #define REF_DEBUG_ONLY_QUEUES */ /*! * \par Please read before modifying this file. @@ -603,10 +603,10 @@ static int queue_cmp_cb(void *obj, void *arg, int flags) } #ifdef REF_DEBUG_ONLY_QUEUES -#define queue_ref(a) _ao2_ref_debug(a,1,"",__FILE__,__LINE__,__PRETTY_FUNCTION__) -#define queue_unref(a) _ao2_ref_debug(a,-1,"",__FILE__,__LINE__,__PRETTY_FUNCTION__) -#define queue_t_ref(a,b) _ao2_ref_debug(a,1,b,__FILE__,__LINE__,__PRETTY_FUNCTION__) -#define queue_t_unref(a,b) _ao2_ref_debug(a,-1,b,__FILE__,__LINE__,__PRETTY_FUNCTION__) +#define queue_ref(a) _ao2_ref_debug(a,1,"",__FILE__,__LINE__,__PRETTY_FUNCTION__), a +#define queue_unref(a) _ao2_ref_debug(a,-1,"",__FILE__,__LINE__,__PRETTY_FUNCTION__), NULL +#define queue_t_ref(a,b) _ao2_ref_debug(a,1,b,__FILE__,__LINE__,__PRETTY_FUNCTION__), a +#define queue_t_unref(a,b) _ao2_ref_debug(a,-1,b,__FILE__,__LINE__,__PRETTY_FUNCTION__), NULL #define queues_t_link(c,q,tag) _ao2_link_debug(c,q,tag,__FILE__,__LINE__,__PRETTY_FUNCTION__) #define queues_t_unlink(c,q,tag) _ao2_unlink_debug(c,q,tag,__FILE__,__LINE__,__PRETTY_FUNCTION__) #else