From e893aab0d12284c8909ebacfca529c0b554abb9c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 4 Jul 2018 12:11:08 +0100
Subject: 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>
---
 libasm/ChangeLog    | 8 ++++++++
 libasm/asm_end.c    | 1 -
 libasm/asm_newscn.c | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'libasm')

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index fffcced0..2efd85fa 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,11 @@
+2018-07-04  Ross Burton <ross.burton@intel.com>
+
+	* asm_end.c: Remove error.h include.
+	* asm_newscn.c: Likewise.
+	* i386_gendis.c: Likewise and add system.h include.
+	* i386_lex.l: Likewise.
+	* i386_parse.y: Likewise.
+
 2017-02-27  Ulf Hermann  <ulf.hermann@qt.io>
 
 	* Makefile.am: Use dso_LDFLAGS.
diff --git a/libasm/asm_end.c b/libasm/asm_end.c
index ced24f50..5aab8dfa 100644
--- a/libasm/asm_end.c
+++ b/libasm/asm_end.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <assert.h>
-#include <error.h>
 #include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libasm/asm_newscn.c b/libasm/asm_newscn.c
index ddbb25df..7cdf484f 100644
--- a/libasm/asm_newscn.c
+++ b/libasm/asm_newscn.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <assert.h>
-#include <error.h>
 #include <libintl.h>
 #include <stdlib.h>
 #include <string.h>
-- 
cgit v1.2.3