kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Asterisk to compile under GCC 4.10

Browse Source 
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:
Kinsey Moore
2014-05-09 22:49:26 +00:00
parent f3b55da1b8
commit abd3e4040b
138 changed files with 726 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/bridge_softmix.c
View File

@@ -665,7 +665,7 @@ static int softmix_bridge_write(struct ast_bridge *bridge, struct ast_bridge_cha
ast_log(LOG_ERROR, "Synchronous bridge action written to a softmix bridge.\n");
ast_assert(0);
default:
ast_debug(3, "Frame type %d unsupported\n", frame->frametype);
ast_debug(3, "Frame type %u unsupported\n", frame->frametype);
/* "Accept" the frame and discard it. */
break;
}
@@ -724,7 +724,7 @@ static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct so
* from the current rate we are using. */
if (softmix_data->internal_rate != stats->locked_rate) {
softmix_data->internal_rate = stats->locked_rate;
ast_debug(1, "Bridge is locked in at sample rate %d\n",
ast_debug(1, "Bridge is locked in at sample rate %u\n",
softmix_data->internal_rate);
return 1;
}
@@ -764,14 +764,14 @@ static unsigned int analyse_softmix_stats(struct softmix_stats *stats, struct so
}
}
ast_debug(1, "Bridge changed from %d To %d\n",
ast_debug(1, "Bridge changed from %u To %u\n",
softmix_data->internal_rate, best_rate);
softmix_data->internal_rate = best_rate;
return 1;
} else if (!stats->num_at_internal_rate && !stats->num_above_internal_rate) {
/* In this case, the highest supported rate is actually lower than the internal rate */
softmix_data->internal_rate = stats->highest_supported_rate;
ast_debug(1, "Bridge changed from %d to %d\n",
ast_debug(1, "Bridge changed from %u to %u\n",
softmix_data->internal_rate, stats->highest_supported_rate);
return 1;
}