aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2004-04-14 03:12:51 +0000
committerDJ Delorie <dj@redhat.com>2004-04-14 03:12:51 +0000
commit53239e41047d1316540c37f49a16a37686249bd5 (patch)
tree702ff78079a9e9e1fa6ce9cb4b192df8d182b49d
parent010abebbb1d394f477ead4b392a23279000bb949 (diff)
downloadgdb-53239e41047d1316540c37f49a16a37686249bd5.zip
gdb-53239e41047d1316540c37f49a16a37686249bd5.tar.gz
gdb-53239e41047d1316540c37f49a16a37686249bd5.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/strerror.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7da2d46..ec90d1a 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-13 Ian Lance Taylor <ian@wasabisystems.com>
+
+ * strerror.c: Include config.h, and redefine sys_nerr and
+ sys_errlist, before including ansidecl.h and libiberty.h.
+
2004-04-13 Jeff Law <law@redhat.com>
* hashtab.c (htab_remove_elt_with_hash): New function.
diff --git a/libiberty/strerror.c b/libiberty/strerror.c
index 83a5992..c0edb47 100644
--- a/libiberty/strerror.c
+++ b/libiberty/strerror.c
@@ -2,9 +2,6 @@
Written by Fred Fish. fnf@cygnus.com
This file is in the public domain. --Per Bothner. */
-#include "ansidecl.h"
-#include "libiberty.h"
-
#include "config.h"
#ifdef HAVE_SYS_ERRLIST
@@ -17,6 +14,9 @@
#define sys_errlist sys_errlist__
#endif
+#include "ansidecl.h"
+#include "libiberty.h"
+
#include <stdio.h>
#include <errno.h>