More patches from the pbatard branch.

2012-03-04 14:37:07 -05:00
parent 14f6f505ce
commit d0b09d15ef
14 changed files with 58 additions and 138 deletions
--- a/lib/driver/MSWindows/win32_ioctl.c
+++ b/lib/driver/MSWindows/win32_ioctl.c
@@ -31,12 +31,19 @@
 # include "NtScsi.h"
 # include "undocumented.h"
 #else
+#if defined (__MINGW64__)
+# define _NTSRB_ /* Bad things happen if srb.h gets included */
+# include <windows.h>
+# include <ntddcdrm.h>
+# include <ntddscsi.h>
+#else
 # include <ddk/ntddcdrm.h>
 # include <ddk/ntddscsi.h>
+#endif
 # include <ddk/scsi.h>
 #endif

-#ifdef WIN32
+#if defined (_WIN32)
 #include <windows.h>
 #endif