[src/trunk]: src/external/cddl/osnet/dist/lib/libdtrace/common Rearrange headers

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a7d03b7cdcc
branches:  trunk
changeset: 350502:4a7d03b7cdcc
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 12 23:12:59 2017 +0000

description:
Rearrange headers

diffstat:

 external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r a5f6985d2f38 -r 4a7d03b7cdcc external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
--- a/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c   Thu Jan 12 23:06:23 2017 +0000
+++ b/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c   Thu Jan 12 23:12:59 2017 +0000
@@ -27,12 +27,17 @@
 #pragma ident  "%Z%%M% %I%     %E% SMI"
 
 #define        ELF_TARGET_ALL
-#include <elf.h>
 #ifdef __NetBSD__
 #ifdef __x86_64__
 #include <i386/elf_machdep.h>
+#undef ELF32_MACHDEP_ID_CASES
+#undef ELF64_MACHDEP_ID_CASES
+#undef ELF64_MACHDEP_ENDIANNESS
+#undef ARCH_ELFSIZE
+#undef R_TYPE
 #endif
 #endif
+#include <elf.h>
 
 #include <sys/types.h>
 #ifdef illumos