Merge tag 'elfutils-0.174'

elfutils 0.174 release

Change-Id: Ibcbdfca61cf0b65391ab6d0ad00f18ba61027e07

4 files changed, 8 insertions, 2 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5655b3c1..8aa19734 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -23,6 +23,12 @@
 	* eu-config.h: Define unlocked I/O functions to locked ones if they
 	are unavailable.
 
+2018-07-04  Ross Burton <[email protected]>
+
+	* color.c: Remove error.h, add system.h include.
+	* system.h: Add error.h include.
+	* xmalloc.c: Remove error.h include.
+
 2018-06-01  Mark Wielaard  <[email protected]>
 
 	* printversion.c (print_version): Update copyright year.
diff --git a/lib/color.c b/lib/color.c
index f62389d5..9ffbf55f 100644
--- a/lib/color.c
+++ b/lib/color.c
@@ -32,11 +32,11 @@
 #endif
 
 #include <argp.h>
-#include <error.h>
 #include <libintl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "system.h"
 #include "libeu.h"
 #include "color.h"
 
diff --git a/lib/system.h b/lib/system.h
index 3a6b8e93..5275a7b2 100644
--- a/lib/system.h
+++ b/lib/system.h
@@ -30,6 +30,7 @@
 #define LIB_SYSTEM_H	1
 
 #include <errno.h>
+#include <error.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/param.h>
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 0cde384f..0424afc8 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -30,7 +30,6 @@
 # include <config.h>
 #endif
 
-#include <error.h>
 #include <libintl.h>
 #include <stddef.h>
 #include <stdlib.h>