Consolidate error.h inclusion in system.h

error.h isn't standard and so isn't part of the musl C library.
To easy future porting, consolidate the inclusion of error.h into system.h.

https://sourceware.org/bugzilla/show_bug.cgi?id=21008

Signed-off-by: Ross Burton <[email protected]>

18 files changed, 24 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d962bbb..606a5973 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2018-07-04  Ross Burton <[email protected]>
+
+	* addr2line.c: Remove error.h include.
+	* ar.c: Likewise.
+	* arlib.c: Likewise and add system.h include.
+	* arlib2.c: Likewise.
+	* elfcmp.c: Likewise.
+	* elfcompress.c: Likewise.
+	* elflint.c: Likewise.
+	* findtextrel.c: Likewise.
+	* nm.c: Likewise.
+	* objdump.c: Likewise.
+	* ranlib.c: Likewise.
+	* readelf.c: Likewise.
+	* stack.c: Likewise.
+	* strings.c: Likewise.
+	* strip.c: Likewise.
+	* unstrip.c: Likewise.
+
 2018-06-25  Mark Wielaard  <[email protected]>
 
 	* readelf.c (print_decoded_line_section): Use dwarf_next_lines
diff --git a/src/addr2line.c b/src/addr2line.c
index 5acafa00..b7eb893e 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -23,7 +23,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <libdwfl.h>
diff --git a/src/ar.c b/src/ar.c
index 818115bd..6f98f75d 100644
--- a/src/ar.c
+++ b/src/ar.c
@@ -22,7 +22,6 @@
 
 #include <argp.h>
 #include <assert.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <libintl.h>
diff --git a/src/arlib.c b/src/arlib.c
index e0839aab..778e0878 100644
--- a/src/arlib.c
+++ b/src/arlib.c
@@ -21,7 +21,6 @@
 #endif
 
 #include <assert.h>
-#include <error.h>
 #include <gelf.h>
 #include <inttypes.h>
 #include <libintl.h>
@@ -31,6 +30,7 @@
 
 #include <libeu.h>
 
+#include "system.h"
 #include "arlib.h"
 
 
diff --git a/src/arlib2.c b/src/arlib2.c
index 553fc57b..11f44e5d 100644
--- a/src/arlib2.c
+++ b/src/arlib2.c
@@ -20,7 +20,6 @@
 # include <config.h>
 #endif
 
-#include <error.h>
 #include <libintl.h>
 #include <limits.h>
 #include <string.h>
diff --git a/src/elfcmp.c b/src/elfcmp.c
index 50464207..b40df8bf 100644
--- a/src/elfcmp.c
+++ b/src/elfcmp.c
@@ -23,7 +23,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <libintl.h>
@@ -36,7 +35,7 @@
 #include <printversion.h>
 #include "../libelf/elf-knowledge.h"
 #include "../libebl/libeblP.h"
-
+#include "system.h"
 
 /* Prototypes of local functions.  */
 static Elf *open_file (const char *fname, int *fdp, Ebl **eblp);
diff --git a/src/elfcompress.c b/src/elfcompress.c
index 25378a45..bdb0e3b5 100644
--- a/src/elfcompress.c
+++ b/src/elfcompress.c
@@ -18,7 +18,6 @@
 #include <config.h>
 #include <assert.h>
 #include <argp.h>
-#include <error.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -34,6 +33,7 @@
 #include ELFUTILS_HEADER(ebl)
 #include ELFUTILS_HEADER(dwelf)
 #include <gelf.h>
+#include "system.h"
 #include "libeu.h"
 #include "printversion.h"
 
diff --git a/src/elflint.c b/src/elflint.c
index 0a26d97d..eec799b2 100644
--- a/src/elflint.c
+++ b/src/elflint.c
@@ -24,7 +24,6 @@
 #include <assert.h>
 #include <byteswap.h>
 #include <endian.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <inttypes.h>
diff --git a/src/findtextrel.c b/src/findtextrel.c
index 8f1e239a..49731592 100644
--- a/src/findtextrel.c
+++ b/src/findtextrel.c
@@ -23,7 +23,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <libdw.h>
@@ -37,7 +36,7 @@
 #include <unistd.h>
 
 #include <printversion.h>
-
+#include "system.h"
 
 struct segments
 {
diff --git a/src/nm.c b/src/nm.c
index 969c6d35..ffe8ca69 100644
--- a/src/nm.c
+++ b/src/nm.c
@@ -26,7 +26,6 @@
 #include <ctype.h>
 #include <dwarf.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <inttypes.h>
diff --git a/src/objdump.c b/src/objdump.c
index 0dd9a6aa..6b365d5c 100644
--- a/src/objdump.c
+++ b/src/objdump.c
@@ -21,7 +21,6 @@
 #endif
 
 #include <argp.h>
-#include <error.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <libintl.h>
diff --git a/src/ranlib.c b/src/ranlib.c
index cc0ee233..b9083484 100644
--- a/src/ranlib.c
+++ b/src/ranlib.c
@@ -24,7 +24,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <libintl.h>
diff --git a/src/readelf.c b/src/readelf.c
index faed61a6..7cf0d18a 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -24,7 +24,6 @@
 #include <ctype.h>
 #include <dwarf.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <inttypes.h>
diff --git a/src/size.c b/src/size.c
index ad8dbcbb..5ff3f2af 100644
--- a/src/size.c
+++ b/src/size.c
@@ -21,7 +21,6 @@
 #endif
 
 #include <argp.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <inttypes.h>
diff --git a/src/stack.c b/src/stack.c
index 52ae3a86..c5f347e1 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -18,7 +18,6 @@
 #include <config.h>
 #include <assert.h>
 #include <argp.h>
-#include <error.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/src/strings.c b/src/strings.c
index 03d0f133..ef40d5ec 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -25,7 +25,6 @@
 #include <ctype.h>
 #include <endian.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <inttypes.h>
diff --git a/src/strip.c b/src/strip.c
index 773ed548..791347c1 100644
--- a/src/strip.c
+++ b/src/strip.c
@@ -24,7 +24,6 @@
 #include <assert.h>
 #include <byteswap.h>
 #include <endian.h>
-#include <error.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <gelf.h>
diff --git a/src/unstrip.c b/src/unstrip.c
index f368e696..057efef3 100644
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -31,7 +31,6 @@
 #include <argp.h>
 #include <assert.h>
 #include <errno.h>
-#include <error.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <libintl.h>
@@ -48,6 +47,7 @@
 #include <gelf.h>
 #include <libebl.h>
 #include <libdwfl.h>
+#include "system.h"
 #include "libdwelf.h"
 #include "libeu.h"
 #include "printversion.h"