summaryrefslogtreecommitdiff
path: root/libasm
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2020-07-19 21:51:16 +0200
committerMark Wielaard <mark@klomp.org>2020-07-23 22:46:46 +0200
commit15495182302edbe0142101ec3a09e478901ab994 (patch)
tree5c9815b156d25a8f5dc1d5700108e28a7866c2ba /libasm
parent4a3f7f0e4dc1ad2906d05a1014d74c4728817965 (diff)
downloadelfutils-15495182302edbe0142101ec3a09e478901ab994.tar.gz
Only typedef Ebl once.
Since commit 287a18452 libasm.h defines an opague Ebl handle. This is fine, except for (internal) code that also includes libebl.h. Since C11 having multiple typedefs for the same thing is fine, but we do build using GNU/C99. This also allows multiple same typedefs, except for (very) old GCCs. This only affects internal code, since libebl.h isn't a public header. For internal code, only add the typedef in libebl.h when libasm.h hasn't been included. Make sure all code that includes both headers includes libasm.h first. Signed-off-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'libasm')
-rw-r--r--libasm/ChangeLog4
-rw-r--r--libasm/libasmP.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 8ed7fc20..83a65492 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-19 Mark Wielaard <mark@klomp.org>
+
+ * libasmP.h: Include libebl.h after libasm.h.
+
2020-07-05 Mark Wielaard <mark@klomp.org>
* libasm.h: Include gelf.h.
diff --git a/libasm/libasmP.h b/libasm/libasmP.h
index a4703fc3..53d8f3a0 100644
--- a/libasm/libasmP.h
+++ b/libasm/libasmP.h
@@ -31,8 +31,8 @@
#include <stdio.h>
-#include "libebl.h"
#include <libasm.h>
+#include "libebl.h"
#include "libdwelf.h"