From 02236289ba77eb459a7b8b93d73315b9f6cfa351 Mon Sep 17 00:00:00 2001
From: Ulf Wohlers <finsterr@users.sourceforge.net>
Date: Fri, 2 Jan 2004 23:10:31 +0000
Subject: [PATCH] changed to work with new win cdrom header files

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1531
---
 src/dos/cdrom_aspi_win32.cpp  | 9 ++++++---
 src/dos/cdrom_ioctl_win32.cpp | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/dos/cdrom_aspi_win32.cpp b/src/dos/cdrom_aspi_win32.cpp
index 78565f9d..1787e8af 100644
--- a/src/dos/cdrom_aspi_win32.cpp
+++ b/src/dos/cdrom_aspi_win32.cpp
@@ -16,19 +16,22 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: cdrom_aspi_win32.cpp,v 1.7 2004-01-02 14:38:30 qbix79 Exp $ */
+/* $Id: cdrom_aspi_win32.cpp,v 1.8 2004-01-02 23:10:31 finsterr Exp $ */
 
 #if defined (WIN32)
 
 #include <ctype.h>
 
+#include "dosbox.h"
 #include "cdrom.h"
+
 //Are actually system includes but leave for now
+#include "wnaspi32.h"
 #include "ntddcdrm.h"
 #include "ntddscsi.h"
-//#include "scsi.h"			// Aspi stuff
 #include "scsidefs.h"
-#include "dosbox.h"
+
+#include <winioctl.h>
 
 // *****************************************************************
 // Windows ASPI functions (should work for all WIN with ASPI layer)
diff --git a/src/dos/cdrom_ioctl_win32.cpp b/src/dos/cdrom_ioctl_win32.cpp
index b7eb1ef9..fda4e124 100644
--- a/src/dos/cdrom_ioctl_win32.cpp
+++ b/src/dos/cdrom_ioctl_win32.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: cdrom_ioctl_win32.cpp,v 1.7 2004-01-02 14:38:30 qbix79 Exp $ */
+/* $Id: cdrom_ioctl_win32.cpp,v 1.8 2004-01-02 23:10:31 finsterr Exp $ */
 
 #if defined (WIN32)
 
@@ -27,7 +27,7 @@
 #include <windows.h>
 #include <winioctl.h>			// Ioctl stuff
 #include <io.h>
-//Actually a system include but leave for now
+
 #include "ntddcdrm.h"			// Ioctl stuff
 #include "cdrom.h"