commit 3b8ac3320cf35b5701a1e01d7ff72f450de2b184
author Elliott Hughes <enh@google.com> Thu Aug 28 17:42:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 28 17:42:59 2014 +0000
tree ae50514e5e0ddfa68b1412c165eef355edec57cc
parent f3cb7e0eed426b8f0302ca9dcf47cdf067ea93ca
parent 973dfc7228efbc3644fc1011d3c4fe3e3242b34d

Merge "Fix external/chromium build with strerror_r."

base/safe_strerror_posix.cc

diff --git a/base/safe_strerror_posix.cc b/base/safe_strerror_posix.cc
index a91bb8d..892592a 100644
--- a/base/safe_strerror_posix.cc
+++ b/base/safe_strerror_posix.cc
@@ -9,7 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#define USE_HISTORICAL_STRERRO_R (defined(__GLIBC__) || defined(OS_NACL))
+#define USE_HISTORICAL_STRERRO_R (defined(__GLIBC__) || defined(__BIONIC__) || \
+                                  defined(OS_NACL))
 
 #if USE_HISTORICAL_STRERRO_R && defined(__GNUC__)
 // GCC will complain about the unused second wrap function unless we tell it