From 767bc718707ca881d045f39619f8aa36e5a780d9 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 19 Dec 2006 10:49:13 +0100
Subject: [PATCH] Expose integral types in p_elf.h.

---
 src/p_elf.h    | 15 ++++++++++++++-
 src/p_vmlinx.h |  9 ++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/p_elf.h b/src/p_elf.h
index dd09281d..f2db690a 100644
--- a/src/p_elf.h
+++ b/src/p_elf.h
@@ -37,9 +37,14 @@
 namespace N_Elf {
 
 // The ELF file header. This appears at the start of every ELF file.
-template <class Word, class Addr, class Off, class Half>
+template <class TWord, class TAddr, class TOff, class THalf>
 struct Ehdr
 {
+    typedef TWord Word;
+    typedef TAddr Addr;
+    typedef TOff  Off;
+    typedef THalf Half;
+
     unsigned char e_ident[16];  /* Magic number and other info */
     Half e_type;                /* Object file type */
     Half e_machine;             /* Architecture */
@@ -422,6 +427,14 @@ template <class TP, class TEhdr, class TPhdr, class TShdr, class TDyn, class TSy
 struct ElfClass
 {
     typedef TP      BeLePolicy;
+
+    // integral types
+    typedef typename TP::U16     U16;
+    typedef typename TP::U32     U32;
+    typedef typename TP::U64     U64;
+    typedef typename TEhdr::Addr Addr;
+
+    // ELF types
     typedef TEhdr   Ehdr;
     typedef TPhdr   Phdr;
     typedef TShdr   Shdr;
diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h
index f3e64427..d5fd29d4 100644
--- a/src/p_vmlinx.h
+++ b/src/p_vmlinx.h
@@ -41,10 +41,17 @@ class PackVmlinuxBase : public Packer
 {
     typedef Packer super;
 protected:
+    // integral types
+    typedef typename TElfClass::U16  U16;
+    typedef typename TElfClass::U32  U32;
+    typedef typename TElfClass::U64  U64;
+    typedef typename TElfClass::Addr Addr;
+    // ELF types
     typedef typename TElfClass::Ehdr Ehdr;
     typedef typename TElfClass::Shdr Shdr;
     typedef typename TElfClass::Phdr Phdr;
-    typedef /*typename TElfClass::Addr*/ unsigned long Addr;
+    typedef typename TElfClass::Dyn  Dyn;
+    typedef typename TElfClass::Sym  Sym;
 
 public:
     PackVmlinuxBase(InputFile *f,