From c6c404dcd657ee937bdfaafe251893532f1a7d96 Mon Sep 17 00:00:00 2001
From: Rein Klazes <rklazes@xs4all.nl>
Date: Tue, 7 Oct 2003 22:49:22 +0000
Subject: [PATCH] Added a check for <scsi/scsi.h> and include it in
 dlls/ntdll/cdrom.c.

---
 configure           | 2 ++
 configure.ac        | 1 +
 dlls/ntdll/cdrom.c  | 4 ++++
 include/config.h.in | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/configure b/configure
index 9cddd1278d0..ca97a09a1ab 100755
--- a/configure
+++ b/configure
@@ -13828,6 +13828,7 @@ done
 
 
 
+
 
 
 for ac_header in \
@@ -13864,6 +13865,7 @@ for ac_header in \
 	regex.h \
 	sched.h \
 	scsi/sg.h \
+	scsi/scsi.h \
 	scsi/scsi_ioctl.h \
 	socket.h \
 	stdint.h \
diff --git a/configure.ac b/configure.ac
index 5e05122282a..f7197d736b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1021,6 +1021,7 @@ AC_CHECK_HEADERS(\
 	regex.h \
 	sched.h \
 	scsi/sg.h \
+	scsi/scsi.h \
 	scsi/scsi_ioctl.h \
 	socket.h \
 	stdint.h \
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 0c46dc1f75c..a96778a12b5 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -43,6 +43,10 @@
 #ifdef HAVE_SCSI_SG_H
 # include <scsi/sg.h>
 #endif
+#ifdef HAVE_SCSI_SCSI_H
+# include <scsi/scsi.h>
+# undef REASSIGN_BLOCKS  /* avoid conflict with winioctl.h */
+#endif
 #ifdef HAVE_SCSI_SCSI_IOCTL_H
 # include <scsi/scsi_ioctl.h>
 #endif
diff --git a/include/config.h.in b/include/config.h.in
index f0bd64f0f5e..d80532a879e 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -428,6 +428,9 @@
 /* Define to 1 if you have the <sched.h> header file. */
 #undef HAVE_SCHED_H
 
+/* Define to 1 if you have the <scsi/scsi.h> header file. */
+#undef HAVE_SCSI_SCSI_H
+
 /* Define to 1 if you have the <scsi/scsi_ioctl.h> header file. */
 #undef HAVE_SCSI_SCSI_IOCTL_H