Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.37
diff -u -r1.37 configure.ac
--- configure.ac	12 May 2002 03:16:39 -0000	1.37
+++ configure.ac	12 May 2002 13:19:43 -0000
@@ -1079,6 +1079,40 @@
    fi
 fi
 
+dnl **** cdrom IOCTL checks ****
+AC_CACHE_CHECK( [whether cdrom_generic_command in linux/cdrom.h defines quiet],
+		wine_cdrom_linux_cdrom_has_quiet,
+   AC_TRY_COMPILE([
+   #include <linux/cdrom.h>
+   ],[
+        struct cdrom_generic_command gen_command;
+
+        gen_command.quiet = 0;
+   ],wine_cdrom_linux_cdrom_has_quiet=yes,wine_cdrom_linux_cdrom_has_quiet=no
+   )
+)
+if test "$wine_cdrom_linux_cdrom_has_quiet" = "yes"
+then
+  AC_DEFINE(CDROM_GENERIC_COMMAND_HAS_QUIET, 1,
+            [Define if the cdrom_generic_command struct defined by <sys/vfs.h> has the member quiet])
+fi
+AC_CACHE_CHECK( [whether cdrom_generic_command in linux/cdrom.h defines timeout],
+		wine_cdrom_linux_cdrom_has_timeout,
+   AC_TRY_COMPILE([
+   #include <linux/cdrom.h>
+   ],[
+        struct cdrom_generic_command gen_command;
+
+        gen_command.timeout = 0;
+   ],wine_cdrom_linux_cdrom_has_timeout=yes,wine_cdrom_linux_cdrom_has_timeout=no
+   )
+)
+if test "$wine_cdrom_linux_cdrom_has_timeout" = "yes"
+then
+  AC_DEFINE(CDROM_GENERIC_COMMAND_HAS_TIMEOUT, 1,
+            [Define if the cdrom_generic_command struct defined by <sys/vfs.h> has the member timeout])
+fi
+
 dnl **** statfs checks ****
 
 if test "$ac_cv_header_sys_vfs_h" = "yes"
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.9
diff -u -r1.9 cdrom.c
--- dlls/ntdll/cdrom.c	1 May 2002 22:25:42 -0000	1.9
+++ dlls/ntdll/cdrom.c	12 May 2002 13:19:43 -0000
@@ -1057,8 +1057,12 @@
     cmd.buffer         = pPacket->DataBuffer;
     cmd.buflen         = pPacket->DataTransferLength;
     cmd.sense          = &sense;
+#ifdef CDROM_GENERIC_COMMAND_HAS_QUIET
     cmd.quiet          = 0;
+#endif
+#ifdef CDROM_GENERIC_COMMAND_HAS_TIMEOUT
     cmd.timeout        = pPacket->TimeOutValue*HZ;
+#endif
 
     switch (pPacket->DataIn)
     {
@@ -1128,8 +1132,12 @@
     }
     cmd.buflen         = pPacket->DataTransferLength;
     cmd.sense          = &sense;
+#ifdef CDROM_GENERIC_COMMAND_HAS_QUIET
     cmd.quiet          = 0;
+#endif
+#ifdef CDROM_GENERIC_COMMAND_HAS_TIMEOUT
     cmd.timeout        = pPacket->TimeOutValue*HZ;
+#endif
 
     switch (pPacket->DataIn)
     {