summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-03-29 03:03:42 +0000
committerobrien <obrien@FreeBSD.org>2003-03-29 03:03:42 +0000
commit2b9574f51ace85f5825f1dc84d6c2189fab33ae8 (patch)
treed940959e4a1f3097c823263734d747f27ade892f /usr.bin
parent44afb4dc11869b17f8419db67d2a03a30f557026 (diff)
downloadFreeBSD-src-2b9574f51ace85f5825f1dc84d6c2189fab33ae8.zip
FreeBSD-src-2b9574f51ace85f5825f1dc84d6c2189fab33ae8.tar.gz
Back out the totally unapproved backout of my commits.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/elf2aout/Makefile1
-rw-r--r--usr.bin/elf2aout/elf2aout.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile
index f64004e..24f73f8 100644
--- a/usr.bin/elf2aout/Makefile
+++ b/usr.bin/elf2aout/Makefile
@@ -4,6 +4,5 @@ PROG= elf2aout
NOMAN=
NO_WERROR?=
WARNS?= 5
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/crunch/crunchide
.include <bsd.prog.mk>
diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index a9e1a01..3abf818 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/elf64.h>
+#include <sys/endian.h>
#include <sys/mman.h>
#include <sys/stat.h>
@@ -37,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include "endian.h"
#define xe16toh(x) ((data == ELFDATA2MSB) ? be16toh(x) : le16toh(x))
#define xe32toh(x) ((data == ELFDATA2MSB) ? be32toh(x) : le32toh(x))
#define xe64toh(x) ((data == ELFDATA2MSB) ? be64toh(x) : le64toh(x))
OpenPOWER on IntegriCloud