From: Karel Zak <kzak@redhat.com>
Date: Wed, 13 Jan 2010 09:51:57 +0000 (+0100)
Subject: fdisk: don't include scsi.h
X-Git-Tag: v2.17.1-rc1~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3e8c8782a6211d843e86fea10cdb678a2ee6fd0;p=thirdparty%2Futil-linux.git

fdisk: don't include scsi.h

The fdisksunlabel.c header file is unnecessary for fdisk/fdisksunlabel.h.

Reported-by: Thomas Stalder <thomas@netsolux.ch>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index e7750627cd..5ddeaa5d9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ AC_CHECK_HEADERS(
 	net/if_dl.h \
         netinet/in.h \
 	rpcsvc/nfs_prot.h \
-	scsi/scsi.h \
 	stdlib.h \
 	sys/disk.h \
 	sys/disklabel.h \
diff --git a/fdisk/fdisksunlabel.c b/fdisk/fdisksunlabel.c
index 2f9fad9062..670a15a56d 100644
--- a/fdisk/fdisksunlabel.c
+++ b/fdisk/fdisksunlabel.c
@@ -22,11 +22,6 @@
 #include "blkdev.h"
 
 #include <endian.h>
-#ifdef HAVE_SCSI_SCSI_H
-#define u_char	unsigned char
-#include <scsi/scsi.h>		/* SCSI_IOCTL_GET_IDLUN */
-#undef u_char
-#endif
 #ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>	/* FLOPPY_MAJOR */
 #endif