diff options
| author | David M. Lee <dlee@digium.com> | 2015-01-26 14:50:40 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2015-01-26 14:50:40 +0000 |
| commit | 965777ccfc61067d1dc79f79c12d52f794fa3983 (patch) | |
| tree | fc931f38e9acc6885ca0df5fdbc1e14bac437495 /channels/sip | |
| parent | a8ae5a7bcb3c102b1a196d109a1d06507dd3dd1e (diff) | |
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/
........
Merged revisions 431092 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
| -rw-r--r-- | channels/sip/include/route.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |