diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-22 10:18:48 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-22 10:34:51 -0800 |
| commit | bf8bc5cd910a03f4e22ec722b07e5c67823e082b (patch) | |
| tree | 95fa9e0f3118753eba16134120389aa4fa8d73a9 | |
| parent | 7d252f952a65e5cfee917258f04596e6cfe57398 (diff) | |
| download | webrtc-bf8bc5cd910a03f4e22ec722b07e5c67823e082b.tar.gz | |
Allow compilation with global C++11.
spreadsort.hpp used a template parameter named `getchar`. In early
versions of the NDK (such as the one used by this project), getchar is
defined as a macro. For whatever reason, C++11 affects this behavior,
so explicitly use the default standard version (gnu++98).
Change-Id: I356c2c0886f1c5436732c902a6d22ccfd25bf725
| -rw-r--r-- | src/system_wrappers/source/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index 774cc284dd..2f3a281548 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -43,8 +43,8 @@ LOCAL_SRC_FILES := \ trace_posix.cc \ rw_lock_posix.cc -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS) +LOCAL_CPPFLAGS := -std=gnu++98 LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86) |