From b5c4aa21103554a316dc7111c2bdf477ea020054 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Tue, 1 Sep 2015 23:48:08 +0000
Subject: [PATCH] changed config.h to use elfio's ELF types, not elf.h's. 
 avoids naming conflicts.

Former-commit-id: 722f1ed3a082a1ec31c6c0f755e695063580639c
---
 include/i686/config.h  | 22 +++++++++++-----------
 include/i86pc/config.h | 22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/i686/config.h b/include/i686/config.h
index 220142079..8f59038df 100644
--- a/include/i686/config.h
+++ b/include/i686/config.h
@@ -58,17 +58,17 @@ typedef s_uint64_t 	   counter_t;
 #define NULL 0
 #endif
 
-#include <elf.h>
-
-typedef Elf32_Ehdr  IRDB_Elf_Ehdr;
-typedef Elf32_Shdr  IRDB_Elf_Shdr;
-typedef Elf32_Off   IRDB_Elf_Off;
-typedef Elf32_Half  IRDB_Elf_Half;
-typedef Elf32_Word  IRDB_Elf_Word;
-typedef Elf32_Addr  IRDB_Elf_Addr;
-typedef Elf32_Sym  IRDB_Elf_Sym;
-typedef Elf32_Rel  IRDB_Elf_Rel;
-typedef Elf32_Rela  IRDB_Elf_Rela;
+#include <elfio/elfio.hpp>
+
+typedef ELFIO::Elf32_Ehdr  IRDB_Elf_Ehdr;
+typedef ELFIO::Elf32_Shdr  IRDB_Elf_Shdr;
+typedef ELFIO::Elf32_Off   IRDB_Elf_Off;
+typedef ELFIO::Elf32_Half  IRDB_Elf_Half;
+typedef ELFIO::Elf32_Word  IRDB_Elf_Word;
+typedef ELFIO::Elf32_Addr  IRDB_Elf_Addr;
+typedef ELFIO::Elf32_Sym  IRDB_Elf_Sym;
+typedef ELFIO::Elf32_Rel  IRDB_Elf_Rel;
+typedef ELFIO::Elf32_Rela  IRDB_Elf_Rela;
 #define IRDB_ELF_ST_TYPE ELF32_ST_TYPE
 
 
diff --git a/include/i86pc/config.h b/include/i86pc/config.h
index 220142079..8f59038df 100644
--- a/include/i86pc/config.h
+++ b/include/i86pc/config.h
@@ -58,17 +58,17 @@ typedef s_uint64_t 	   counter_t;
 #define NULL 0
 #endif
 
-#include <elf.h>
-
-typedef Elf32_Ehdr  IRDB_Elf_Ehdr;
-typedef Elf32_Shdr  IRDB_Elf_Shdr;
-typedef Elf32_Off   IRDB_Elf_Off;
-typedef Elf32_Half  IRDB_Elf_Half;
-typedef Elf32_Word  IRDB_Elf_Word;
-typedef Elf32_Addr  IRDB_Elf_Addr;
-typedef Elf32_Sym  IRDB_Elf_Sym;
-typedef Elf32_Rel  IRDB_Elf_Rel;
-typedef Elf32_Rela  IRDB_Elf_Rela;
+#include <elfio/elfio.hpp>
+
+typedef ELFIO::Elf32_Ehdr  IRDB_Elf_Ehdr;
+typedef ELFIO::Elf32_Shdr  IRDB_Elf_Shdr;
+typedef ELFIO::Elf32_Off   IRDB_Elf_Off;
+typedef ELFIO::Elf32_Half  IRDB_Elf_Half;
+typedef ELFIO::Elf32_Word  IRDB_Elf_Word;
+typedef ELFIO::Elf32_Addr  IRDB_Elf_Addr;
+typedef ELFIO::Elf32_Sym  IRDB_Elf_Sym;
+typedef ELFIO::Elf32_Rel  IRDB_Elf_Rel;
+typedef ELFIO::Elf32_Rela  IRDB_Elf_Rela;
 #define IRDB_ELF_ST_TYPE ELF32_ST_TYPE
 
 
-- 
GitLab