More patches from the pbatard branch.

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
 

lib/driver/realpath.c

@@ -46,7 +46,7 @@
 # include <string.h>
 #endif
 
-#ifdef HAVE_UNISTD_H // readlink
+#ifdef HAVE_UNISTD_H /* readlink */
 # include <unistd.h>
 #endif
 

lib/driver/sector.c

@@ -28,7 +28,9 @@
 #include "cdio_assert.h"
 #include "portable.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif

lib/driver/util.c

@@ -26,7 +26,9 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 
 #ifdef HAVE_STRING_H
 #include <string.h>