Added a check for <scsi/scsi.h> and include it in dlls/ntdll/cdrom.c.

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 \

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 \

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

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