diff options
| author | rocky <rocky@gnu.org> | 2012-10-21 18:05:59 -0400 |
|---|---|---|
| committer | rocky <rocky@gnu.org> | 2012-10-21 18:05:59 -0400 |
| commit | d686fcea866e6e6ca65615bc79ad3f36712fa51e (patch) | |
| tree | cefc921dcf4a749bbb3ed6d64ad89725278584d6 | |
| parent | 169c9fdd850dd6b0265ace4c8bbd2048e1748d29 (diff) | |
Convert win32_ioctl.c to use header-tested includes from configure
| -rw-r--r-- | configure.ac | 6 | ||||
| -rwxr-xr-x | lib/driver/MSWindows/win32_ioctl.c | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f879c141..95877c63 100644 --- a/configure.ac +++ b/configure.ac @@ -193,8 +193,10 @@ AC_TRY_COMPILE([],[_Pragma("pack(1)")], [ ],ISOC99_PRAGMA=no) AC_MSG_RESULT($ISOC99_PRAGMA) -## Check for Windows DDK header files -AC_CHECK_HEADERS([ntdddisk.h ddk/ntdddisk.h], [], [], [AC_INCLUDES_DEFAULT +## Check for Windows header files +AC_CHECK_HEADERS([ntddcdrm.h ddk/ntddcdrm.h \ + ntddscsi.h ddk/ntddscsi.h ddk/scsi.h], +[], [], [AC_INCLUDES_DEFAULT #include <windows.h> ]) diff --git a/lib/driver/MSWindows/win32_ioctl.c b/lib/driver/MSWindows/win32_ioctl.c index 78e20d80..fed74e04 100755 --- a/lib/driver/MSWindows/win32_ioctl.c +++ b/lib/driver/MSWindows/win32_ioctl.c @@ -33,15 +33,23 @@ #else # if defined (__MINGW64__) # define _NTSRB_ /* Bad things happen if srb.h gets included */ -# include <windows.h> -# include <ntddcdrm.h> -# include <ntddscsi.h> +# endif +# include <windows.h> +# ifdef HAVE_DDK_SCSI_H # include <ddk/scsi.h> -# else -# include <windows.h> +# endif +# ifdef HAVE_NTDDCDRM_H # include <ntddcdrm.h> +# endif +# ifdef HAVE_DDK_NTDDCDRM_H +# include <ddk/ntddcdrm.h> +# endif +# ifdef HAVE_NTDDSCSI_H # include <ntddscsi.h> # endif +# ifdef HAVE_DDK_NTDDSCSI_H +# include <ddk/ntddscsi.h> +# endif #endif #if defined (_WIN32) |