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 /main/app.c | |
| 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 'main/app.c')
| -rw-r--r-- | main/app.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c index 53987d8cd..cd7078ea1 100644 --- a/main/app.c +++ b/main/app.c @@ -2911,7 +2911,9 @@ int ast_safe_fork(int stop_reaper) ast_replace_sigchld(); } - sigfillset(&signal_set); + /* GCC 4.9 gives a bogus "right-hand operand of comma expression has + * no effect" warning */ + (void) sigfillset(&signal_set); pthread_sigmask(SIG_BLOCK, &signal_set, &old_set); pid = fork(); |