commit 754b5f23b7a17658ab16ff9899b4e15de011a465
author Christopher N. Hesse <raymanfx@gmail.com> Sat Dec 02 00:57:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 02 00:57:18 2017 +0000
tree 2090c573393bf187e74adbcb1ddc25d9fd4edde6
parent 003274b4599f2980c31c21742f3d2d5b18639c57
parent c7dfe59c8087b9e4d1fcbc50e5b9f66137e5ceba

Merge "lib: vasnprintf: Fix illegal instruction"
am: c7dfe59c80

Change-Id: I9aa156e16e1b144b537c460d1f1f6fcba69f8523

lib/vasnprintf.c

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index e6fc523..06a789d 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -4870,7 +4870,7 @@
 #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';