[asterisk-commits] tilghman: branch 1.6.1 r231608 - /branches/1.6.1/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Nov 30 14:58:33 2009
New Revision: 231608

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231608
Log:
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)

Modified:
    branches/1.6.1/apps/app_queue.c

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=231608&r1=231607&r2=231608
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Mon Nov 30 14:58:33 2009
@@ -95,7 +95,7 @@
 #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 @@
 }
 
 #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