From 57c8eea6fe798b22e478c2bc1f8294a9292ff355 Mon Sep 17 00:00:00 2001 From: Mark Michelson <mmichelson@digium.com> Date: Tue, 27 Apr 2010 19:52:18 +0000 Subject: [PATCH] Change cc_ref and cc_unref from macros to inline functions. The hope is that Solaris won't be as whiny after this change. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@259357 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/ccss.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/main/ccss.c b/main/ccss.c index 583c7389c7..5430581ddd 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -98,8 +98,17 @@ static unsigned int global_cc_max_requests; */ static int cc_request_count; -#define cc_ref(obj, debug) ({ao2_t_ref((obj), +1, (debug)); (obj);}) -#define cc_unref(obj, debug) ({ao2_t_ref((obj), -1, (debug)); NULL;}) +static inline void *cc_ref(void *obj, const char *debug) +{ + ao2_t_ref(obj, +1, debug); + return obj; +} + +static inline void *cc_unref(void *obj, const char *debug) +{ + ao2_t_ref(obj, -1, debug); + return NULL; +} /*! * \since 1.8 -- GitLab