diff options
author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
---|---|---|
committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
tree | c5695a0880c4928731b1aa864f862c6cffa57428 /channels/chan_alsa.c | |
parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff) |
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which
cause the build to fail under dev mode. The vast majority are
signed/unsigned mismatches in printf-style format strings.
........
Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_alsa.c')
-rw-r--r-- | channels/chan_alsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 98adfddee..9d43ba139 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -207,12 +207,12 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) direction = 0; err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &rate, &direction); if (rate != DESIRED_RATE) - ast_log(LOG_WARNING, "Rate not correct, requested %d, got %d\n", DESIRED_RATE, rate); + ast_log(LOG_WARNING, "Rate not correct, requested %d, got %u\n", DESIRED_RATE, rate); direction = 0; err = snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, &direction); if (err < 0) - ast_log(LOG_ERROR, "period_size(%ld frames) is bad: %s\n", period_size, snd_strerror(err)); + ast_log(LOG_ERROR, "period_size(%lu frames) is bad: %s\n", period_size, snd_strerror(err)); else { ast_debug(1, "Period size is %d\n", err); } @@ -220,7 +220,7 @@ static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream) buffer_size = 4096 * 2; /* period_size * 16; */ err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size); if (err < 0) - ast_log(LOG_WARNING, "Problem setting buffer size of %ld: %s\n", buffer_size, snd_strerror(err)); + ast_log(LOG_WARNING, "Problem setting buffer size of %lu: %s\n", buffer_size, snd_strerror(err)); else { ast_debug(1, "Buffer size is set to %d frames\n", err); } |