diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2017-12-12 22:55:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-12 22:55:27 +0000 |
| commit | 3aa55ff97f356efbc95ed027b08b8af500808c08 (patch) | |
| tree | 2090c573393bf187e74adbcb1ddc25d9fd4edde6 | |
| parent | 7c197b67b420a76b06cb083b2b9ce74243699723 (diff) | |
| parent | d938d065b6098ff4656baeb18f97052b7e33deac (diff) | |
| download | bison-sdk-release.tar.gz | |
Merge "Snap for 4499105 from 754b5f23b7a17658ab16ff9899b4e15de011a465 to sdk-release" into sdk-releasesdk-release
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | lib/vasnprintf.c | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -15,8 +15,7 @@ LOCAL_PATH:= $(call my-dir) ifeq ($(HOST_OS),darwin) -# No -Werror for darwin yet. Need to fix/suppress more warnings. -BISON_WERROR := +BISON_WERROR := -Wno-shift-count-overflow else BISON_WERROR := -Werror endif diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index e6fc5233..06a789d7 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -4870,7 +4870,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif *fbp = dp->conversion; #if USE_SNPRINTF -# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) +# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) fbp[1] = '%'; fbp[2] = 'n'; fbp[3] = '\0'; |