summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog3
-rw-r--r--winsup/cygwin/errno.cc2
2 files changed, 5 insertions, 0 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2e50d0b75..78b3d9664 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,8 @@
2011-02-10 Eric Blake <eblake@redhat.com>
+ * errno.cc (includes): Avoid compilation failure if <string.h>
+ settles on wrong strerror_r signature.
+
* errno.cc (__xpg_strerror_r): New function.
(strerror_r): Update to copy newlib's fixes.
(strerror): Set errno on failure.
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index 33a103859..8ee2a7563 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -12,12 +12,14 @@ details. */
#define _sys_nerr FOO_sys_nerr
#define sys_nerr FOOsys_nerr
#define _sys_errlist FOO_sys_errlist
+#define strerror_r FOO_strerror_r
#include "winsup.h"
#include "cygtls.h"
#include "ntdll.h"
#undef _sys_nerr
#undef sys_nerr
#undef _sys_errlist
+#undef strerror_r
/* Table to map Windows error codes to Errno values. */
/* FIXME: Doing things this way is a little slow. It's trivial to change