From 538e761e025ee84b3b100b7c0eabceaa5b550b49 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Wed, 2 May 2001 23:56:21 +0000
Subject: * include/elf.h has been repo copied to include/elf-hints.h, and it
 no   longer includes machine/elf.h. * consumers of elf.h now use the
 minimalist elf header possible.

This change is motivated by Binutils 2.11.0 and too much clashing over
our base elf headers and the Binutils elf headers.
---
 usr.sbin/kgzip/elfhdr.h | 3 ++-
 usr.sbin/kgzip/kgzcmp.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.sbin/kgzip')

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"
-- 
cgit v1.1