diff options
| author | David M. Lee <dlee@respoke.io> | 2015-06-02 15:07:08 -0500 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2015-06-05 11:23:16 -0500 |
| commit | 9fca378b36918aaf8c697bd4138260f68b968c03 (patch) | |
| tree | 183aad5967332028a959173ec87a4459a7e3ce2d /res | |
| parent | d463bac5742ef59a2ceb90a0ffe7ab0db5aca36b (diff) | |
Fixes for OS X
* Add some type casting so tv_usec can really be a long, instead of
some strange platform specific type.
* Add some .dylib style files to .gitignore.
* Switch from using -Xlinker to -Wl,. For [reasons unknown][], newer
versions of GCC, when compiling the Homebrew formula for Asterisk,
are not properly passing the -Xlinker options to the linker. Given
that -Wl, does exactly the [same thing][], and does it properly, this
patch changes the -Xlinker options to use -Wl, instead.
[reasons unknown]: http://bit.ly/1SUbEYx
[same thing]: https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html
Change-Id: Id5e6b3c6cc86282ea5fca630dc3991137c5bf4dd
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip/pjsip_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c index e3e8f1808..df374964c 100644 --- a/res/res_pjsip/pjsip_options.c +++ b/res/res_pjsip/pjsip_options.c @@ -974,7 +974,7 @@ static int rtt_start_to_str(const void *obj, const intptr_t *args, char **buf) { const struct ast_sip_contact_status *status = obj; - if (ast_asprintf(buf, "%ld.%06ld", status->rtt_start.tv_sec, status->rtt_start.tv_usec) == -1) { + if (ast_asprintf(buf, "%ld.%06ld", (long)status->rtt_start.tv_sec, (long)status->rtt_start.tv_usec) == -1) { return -1; } |