zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Enable C99 mode instead of C89 (default).

Browse Source 
BUG=webrtc:4960
TESTED=Built locally using GYP and GN for Android.
R=andrew@webrtc.org, brettw@chromium.org

Review URL: https://codereview.webrtc.org/1321193003 .

Cr-Commit-Position: refs/heads/master@{#9937}
This commit is contained in:
Henrik Kjellander
2015-09-15 08:15:57 +02:00
parent 66f0da2197
commit 7bff85c2bc
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/BUILD.gn
View File

@ -154,14 +154,18 @@ config("common_config") {
} }
if (is_android && !is_clang) { if (is_android && !is_clang) {
# The Android NDK doesn"t provide optimized versions of these
# functions. Ensure they are disabled for all compilers.
cflags += [ cflags += [
# The Android NDK doesn't provide optimized versions of these
# functions. Ensure they are disabled for all compilers.
"-fno-builtin-cos", "-fno-builtin-cos",
"-fno-builtin-sin", "-fno-builtin-sin",
"-fno-builtin-cosf", "-fno-builtin-cosf",
"-fno-builtin-sinf", "-fno-builtin-sinf",
] ]
cflags_c = [
# Use C99 mode instead of C89 (default).
"-std=c99",
]
} }
} }

6
webrtc/build/common.gypi
View File

@ -373,14 +373,18 @@
], ],
'conditions': [ 'conditions': [
['clang==0', { ['clang==0', {
'cflags': [
# The Android NDK doesn't provide optimized versions of these # The Android NDK doesn't provide optimized versions of these
# functions. Ensure they are disabled for all compilers. # functions. Ensure they are disabled for all compilers.
'cflags': [
'-fno-builtin-cos', '-fno-builtin-cos',
'-fno-builtin-sin', '-fno-builtin-sin',
'-fno-builtin-cosf', '-fno-builtin-cosf',
'-fno-builtin-sinf', '-fno-builtin-sinf',
], ],
'cflags_c': [
# Use C99 mode instead of C89 (default).
'-std=c99',
]
}], }],
], ],
}], }],

3
webrtc/modules/audio_coding/codecs/ilbc/nearest_neighbor.c
View File

@ -22,9 +22,8 @@ void WebRtcIlbcfix_NearestNeighbor(size_t* index,
const size_t* array, const size_t* array,
size_t value, size_t value,
size_t arlength) { size_t arlength) {
size_t i;
size_t min_diff = (size_t)-1; size_t min_diff = (size_t)-1;
for (i = 0; i < arlength; i++) { for (size_t i = 0; i < arlength; i++) {
const size_t diff = const size_t diff =
(array[i] < value) ? (value - array[i]) : (array[i] - value); (array[i] < value) ? (value - array[i]) : (array[i] - value);
if (diff < min_diff) { if (diff < min_diff) {