Abstract model more - break 'make check'

[centaur.git] / include / libelfu / modeltypes.h

diff --git a/include/libelfu/modeltypes.h b/include/libelfu/modeltypes.h
index 18f66717cc77f9954aaa3f5a3fcc9ea742f3302d..c02eb3405eee72aee6948fbd73f41bdf0818b60d 100644 (file)
--- a/include/libelfu/modeltypes.h
+++ b/include/libelfu/modeltypes.h
@@ -4,20 +4,17 @@
 #include <sys/queue.h>
 
 #include <elf.h>
-#include <gelf.h>
-
-typedef struct ElfuData {
-  Elf_Data data;
-
-  CIRCLEQ_ENTRY(ElfuData) elem;
-} ElfuData;
+#include <libelf/gelf.h>
 
 
 typedef struct ElfuScn {
   GElf_Shdr shdr;
 
-  CIRCLEQ_HEAD(DataList, ElfuData) dataList;
+  Elf_Data data;
+
+  struct ElfuScn *link;
 
+  CIRCLEQ_ENTRY(ElfuScn) elemPhdrToScn;
   CIRCLEQ_ENTRY(ElfuScn) elem;
 } ElfuScn;
 
@@ -25,6 +22,8 @@ typedef struct ElfuScn {
 typedef struct ElfuPhdr {
   GElf_Phdr phdr;
 
+  CIRCLEQ_HEAD(PhdrToScnList, ElfuScn) phdrToScnList;
+
   CIRCLEQ_ENTRY(ElfuPhdr) elem;
 } ElfuPhdr;