diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-04 12:11:08 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2018-07-05 21:06:40 +0200 |
| commit | e893aab0d12284c8909ebacfca529c0b554abb9c (patch) | |
| tree | 7c50c7de9492e68b36ef7dbfedca4404aa198c60 /lib | |
| parent | d612684109f0395b86e4aaad9ba94e02f79a099a (diff) | |
| download | elfutils-e893aab0d12284c8909ebacfca529c0b554abb9c.tar.gz | |
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 <ross.burton@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/color.c | 2 | ||||
| -rw-r--r-- | lib/system.h | 1 | ||||
| -rw-r--r-- | lib/xmalloc.c | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index fbe34a82..86a53d2c 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2018-07-04 Ross Burton <ross.burton@intel.com> + + * 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 <mark@klomp.org> * 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 92033355..292082bd 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> |