Module Name: src
Committed By: christos
Date: Thu Jan 12 23:12:59 UTC 2017
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_link.c
Log Message:
Rearrange headers
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.8 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.9
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.8 Thu Sep 24 10:25:29 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Thu Jan 12 18:12:59 2017
@@ -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
