From 702d79de2a2341954ef599f4c5a4c5f31c1b5edc Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Mon, 26 Jan 2015 14:49:32 +0000 Subject: Various fixes for OS X This patch addresses compilation errors on OS X. It's been a while, so there's quite a few things. * Fixed __attribute__ decls in route.h to be portable. * Fixed htonll and ntohll to work when they are defined as macros. * Replaced sem_t usage with our ast_sem wrapper. * Added ast_sem_timedwait to our ast_sem wrapper. * Fixed some GCC 4.9 warnings using sig*set() functions. * Fixed some format strings for portability. * Fixed compilation issues with res_timing_kqueue (although tests still fail on OS X). * Fixed menuconfig /sbin/launchd detection, which disables res_timing_kqueue on OS X). ASTERISK-24539 #close Reported by: George Joseph ASTERISK-24544 #close Reported by: George Joseph Review: https://reviewboard.asterisk.org/r/4327/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@431092 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/sip/include/route.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/sip/include/route.h') diff --git a/channels/sip/include/route.h b/channels/sip/include/route.h index 511f0ff53..3221cce44 100644 --- a/channels/sip/include/route.h +++ b/channels/sip/include/route.h @@ -98,7 +98,7 @@ void sip_route_dump(const struct sip_route *route); * \retval NULL on failure */ struct ast_str *sip_route_list(const struct sip_route *route, int formatcli, int skip) - __attribute_malloc__ __attribute_warn_unused_result__; + __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); /*! * \brief Check if the route is strict -- cgit v1.2.3