From 4aaa632bd969b22b76a5385963133d1cc97cd857 Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Mon, 5 Oct 2015 08:11:45 +0000
Subject: [PATCH] touch up cdrom stuff for mingw64 once again (ny00123)

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

diff --git a/src/dos/cdrom_aspi_win32.cpp b/src/dos/cdrom_aspi_win32.cpp
index 35c891ff..abc48ed1 100644
--- a/src/dos/cdrom_aspi_win32.cpp
+++ b/src/dos/cdrom_aspi_win32.cpp
@@ -32,10 +32,11 @@
 #include <ntddcdrm.h>			// Ioctl stuff
 #include <ntddscsi.h>
 #include <winioctl.h>			// Ioctl stuff
-#else 
-#ifdef __MINGW64_VERSION_MAJOR
-#include <winioctl.h>
-#endif
+#elif (defined __MINGW64_VERSION_MAJOR)
+#include <winioctl.h>			// Ioctl stuff
+#include <ntddcdrm.h>			// Ioctl stuff
+#include <ntddscsi.h>
+#else
 #include "ddk/ntddcdrm.h"		// Ioctl stuff
 #include "ddk/ntddscsi.h"
 #endif
diff --git a/src/dos/cdrom_ioctl_win32.cpp b/src/dos/cdrom_ioctl_win32.cpp
index 615750e1..84e15e97 100644
--- a/src/dos/cdrom_ioctl_win32.cpp
+++ b/src/dos/cdrom_ioctl_win32.cpp
@@ -26,7 +26,7 @@
 #include <windows.h>
 #include <io.h>
 
-#if defined (_MSC_VER)
+#if (defined (_MSC_VER)) || (defined __MINGW64_VERSION_MAJOR)
 #include <ntddcdrm.h>			// Ioctl stuff
 #include <winioctl.h>			// Ioctl stuff
 #else