valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

touch up cdrom stuff for mingw64 once again (ny00123)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3946
This commit is contained in:
Peter Veenstra 2015-10-05 08:11:45 +00:00
parent 6c0cca1878
commit 4aaa632bd9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dos/cdrom_aspi_win32.cpp
View file

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

2
src/dos/cdrom_ioctl_win32.cpp
View file

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