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

c6c404dc · Rein Klazes · Alexandre Julliard · 3e83ec29 · c6c404dc · c6c404dc
Commit c6c404dc authored Oct 07, 2003 by Rein Klazes Committed by Alexandre Julliard Oct 07, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

configure configure +2 -0

configure.ac configure.ac +1 -0

cdrom.c dlls/ntdll/cdrom.c +4 -0

config.h.in include/config.h.in +3 -0

No files found.
--- a/configure
+++ b/configure
@@ -13830,6 +13830,7 @@ done



+
 for ac_header in \
 	arpa/inet.h \
 	arpa/nameser.h \
@@ -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 \

--- 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 \

--- 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

--- 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