From d0c72317dcde4c21e88e37dfd865335fc7f0c079 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@google.com>
Date: Fri, 20 Aug 2021 18:21:20 +0000
Subject: [PATCH] debuginfod, elfclassify: remove unnecessary header inclusion

`error.h`'s inclusion was centralised into the `system.h` header.  As
the implementation currently includes `system.h` already, the inclusion
of `error.h` is unnecessary.  This prepares for a future portability
change to allow elfutil to build with alternate libc implementations.

Signed-off-by: Saleem Abdulrasool <abdulras@google.com>
---
 debuginfod/ChangeLog      | 4 ++++
 debuginfod/debuginfod.cxx | 1 -
 src/ChangeLog             | 4 ++++
 src/elfclassify.c         | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 530f7dc7d..e8e486ab6 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,7 @@
+2021-08-20  Saleem Abdulrasool  <abdulras@google.com>
+
+	* debuginfod.cxx: Remove error.h include.
+
 2021-08-19  Frank Ch. Eigler  <fche@redhat.com>
 
 	PR28249
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index fca07f619..b560fdcb8 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -46,7 +46,6 @@ extern "C" {
 
 #include <unistd.h>
 #include <stdlib.h>
-#include <error.h>
 #include <libintl.h>
 #include <locale.h>
 #include <pthread.h>
diff --git a/src/ChangeLog b/src/ChangeLog
index 312bc5033..b729eaa47 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2021-08-20  Saleem Abdulrasool  <abdulras@google.com>
+
+	* elfclassify.c: Remove error.h include.
+
 2021-03-18  Timm Bäder  <tbaeder@redhat.com>
 
 	* readelf.c (run_advance_pc): New static inline function
diff --git a/src/elfclassify.c b/src/elfclassify.c
index fe7eeeeda..2f70b29a5 100644
--- a/src/elfclassify.c
+++ b/src/elfclassify.c
@@ -19,7 +19,6 @@
 #include <system.h>
 
 #include <argp.h>
-#include <error.h>
 #include <fcntl.h>
 #include <gelf.h>
 #include <stdbool.h>
-- 
2.47.2