summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/crunch/crunchide/exec_elf32.c8
-rw-r--r--usr.sbin/kgzip/elfhdr.h3
-rw-r--r--usr.sbin/kgzip/kgzcmp.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index 45883f4..0087408 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -1,5 +1,3 @@
-/* $NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $ */
-
/*
* Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.
*
@@ -32,8 +30,12 @@
#include <sys/cdefs.h>
#ifndef lint
+#if 0
__RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $");
#endif
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
#ifndef ELFSIZE
#define ELFSIZE 32
@@ -53,7 +55,7 @@ __RCSID("$NetBSD: exec_elf32.c,v 1.4 1997/08/12 06:07:24 mikel Exp $");
#if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
(defined(NLIST_ELF64) && (ELFSIZE == 64))
-#include <elf.h>
+#include <machine/elf.h>
#define CONCAT(x,y) __CONCAT(x,y)
#define ELFNAME(x) CONCAT(elf,CONCAT(ELFSIZE,CONCAT(_,x)))
diff --git a/usr.sbin/kgzip/elfhdr.h b/usr.sbin/kgzip/elfhdr.h
index b14b9f1..f689119 100644
--- a/usr.sbin/kgzip/elfhdr.h
+++ b/usr.sbin/kgzip/elfhdr.h
@@ -26,7 +26,8 @@
* $FreeBSD$
*/
-#include <elf.h>
+#include <sys/types.h>
+#include <machine/elf.h>
#include "kgz.h"
/* Section header indices */
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 09086ad..b692315 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -29,6 +29,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#include <machine/elf.h>
#include <err.h>
#include <fcntl.h>
@@ -37,7 +38,6 @@
#include <unistd.h>
#include <a.out.h>
-#include <elf.h>
#include "aouthdr.h"
#include "elfhdr.h"
OpenPOWER on IntegriCloud