wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1203476 - Fix an Android-only warning in mozalloc_abort.cpp. r=glandium.

Browse Source 
And remove the corresponding and now-unnecessary ALLOW_COMPILER_WARNINGS=True.
This commit is contained in:
Nicholas Nethercote 2015-09-10 16:20:19 -07:00
parent 74b582930c
commit b0fdb0c663
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
memory/mozalloc/moz.build
View File

@ -40,9 +40,6 @@ GENERATED_INCLUDES += ['/xpcom']
DISABLE_STL_WRAPPING = True DISABLE_STL_WRAPPING = True
if not CONFIG['CLANG_CXX'] and not CONFIG['_MSC_VER']:
ALLOW_COMPILER_WARNINGS = True
DEFINES['IMPL_MFBT'] = True DEFINES['IMPL_MFBT'] = True
if CONFIG['_MSC_VER']: if CONFIG['_MSC_VER']:

6
memory/mozalloc/mozalloc_abort.cpp
View File

@ -78,6 +78,12 @@ void abort(void)
#endif #endif
mozalloc_abort(msg); mozalloc_abort(msg);
// We won't reach here because mozalloc_abort() is MOZ_NORETURN. But that
// annotation isn't used on ARM (see mozalloc_abort.h for why) so we add a
// redundant MOZ_CRASH() here to avoid a "'noreturn' function does return"
// warning.
MOZ_CRASH();
} }
#endif #endif