mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user