aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-06-27 08:01:47 -0700
committerH. Peter Anvin <hpa@zytor.com>2012-06-27 08:01:47 -0700
commit2a2fd4f65be041d467532c0f19325978dbda7a5b (patch)
treea5ca1d4867274784728ae7f41f4c31fea1656098
parent876bf608bb2a0e4da78dbeb2b0ae40ef88e254c1 (diff)
downloadsyslinux-2a2fd4f65be041d467532c0f19325978dbda7a5b.tar.gz
syslinux-2a2fd4f65be041d467532c0f19325978dbda7a5b.tar.xz
syslinux-2a2fd4f65be041d467532c0f19325978dbda7a5b.zip
win32: assume STORAGE_DEVICE_NUMBER is defined
If using mingw-w64 to build for win32, this will be defined. This is confusing, especially since mingw-w64 defined __MINGW32__ but nothing else... thus hide this definition for now. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--win/syslinux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/syslinux.c b/win/syslinux.c
index 26e5a278..c0c4fb23 100644
--- a/win/syslinux.c
+++ b/win/syslinux.c
@@ -50,7 +50,7 @@ void error(char *msg);
// The following struct should be in the ntddstor.h file, but I didn't have it.
// mingw32 has <ddk/ntddstor.h>, but including that file causes all kinds
// of other failures. mingw64 has it in <winioctl.h>.
-#ifndef __x86_64__
+#if 0 /* Until we can figure out how to auto-detect this? */
typedef struct _STORAGE_DEVICE_NUMBER {
DEVICE_TYPE DeviceType;
ULONG DeviceNumber;