NaCl base bringup....

base/safe_strerror_posix.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "base/safe_strerror_posix.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
-#if defined(__GLIBC__) && defined(__GNUC__)
+#define USE_HISTORICAL_STRERRO_R (defined(__GLIBC__) || defined(OS_NACL))
+
+#if USE_HISTORICAL_STRERRO_R && defined(__GNUC__)
 // GCC will complain about the unused second wrap function unless we tell it
 // that we meant for them to be potentially unused, which is exactly what this
 // attribute is for.
 #define POSSIBLY_UNUSED __attribute__((unused))
 #else
 #define POSSIBLY_UNUSED
 #endif
 
-#if defined(__GLIBC__)
+#if USE_HISTORICAL_STRERRO_R
 // glibc has two strerror_r functions: a historical GNU-specific one that
 // returns type char *, and a POSIX.1-2001 compliant one available since 2.3.4
 // that returns int. This wraps the GNU-specific one.
 static void POSSIBLY_UNUSED wrap_posix_strerror_r(
     char *(*strerror_r_ptr)(int, char *, size_t),
     int err,
     char *buf,
     size_t len) {
   // GNU version.
   char *rc = (*strerror_r_ptr)(err, buf, len);
   if (rc != buf) {
     // glibc did not use buf and returned a static string instead. Copy it
     // into buf.
     buf[0] = '\0';
     strncat(buf, rc, len - 1);
   }
   // The GNU version never fails. Unknown errors get an "unknown error" message.
   // The result is always null terminated.
 }
-#endif  // __GLIBC__
+#endif  // USE_HISTORICAL_STRERRO_R
 
 // Wrapper for strerror_r functions that implement the POSIX interface. POSIX
 // does not define the behaviour for some of the edge cases, so we wrap it to
 // guarantee that they are handled. This is compiled on all POSIX platforms, but
 // it will only be used on Linux if the POSIX strerror_r implementation is
 // being used (see below).
 static void POSSIBLY_UNUSED wrap_posix_strerror_r(
     int (*strerror_r_ptr)(int, char *, size_t),
     int err,
     char *buf,
@@ skipping 48 matching lines @@
   // static.
   wrap_posix_strerror_r(&strerror_r, err, buf, len);
 }
 
 std::string safe_strerror(int err) {
   const int buffer_size = 256;
   char buf[buffer_size];
   safe_strerror_r(err, buf, sizeof(buf));
   return std::string(buf);
 }