[syslinux:master] win32: assume STORAGE_DEVICE_NUMBER is defined

syslinux-bot for H. Peter Anvin hpa at zytor.com
Wed Jun 27 08:06:02 PDT 2012


Commit-ID:  2a2fd4f65be041d467532c0f19325978dbda7a5b
Gitweb:     http://www.syslinux.org/commit/2a2fd4f65be041d467532c0f19325978dbda7a5b
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Wed, 27 Jun 2012 08:01:47 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Wed, 27 Jun 2012 08:01:47 -0700

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 at zytor.com>

---
 win/syslinux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/win/syslinux.c b/win/syslinux.c
index 26e5a27..c0c4fb2 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;


More information about the Syslinux-commits mailing list