diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-04-16 00:03:57 +0100 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-04-16 00:03:57 +0100 |
| commit | 9c835700e5553d5b6c5123a244c177faf08afbcf (patch) | |
| tree | 15089cf3706f7b0fdf221ad0107db35641b8ef08 | |
| parent | f08aae4ddb9cfe3856e07f8997d9adbfa5330467 (diff) | |
| download | libusb-9c835700e5553d5b6c5123a244c177faf08afbcf.tar.gz | |
[INTERNAL - NOT FOR RELEASE] added 2003/XP64 support (EXPERIMENTAL)
| -rw-r--r-- | libusb/os/poll_windows.h | 1 | ||||
| -rw-r--r-- | libusb/os/windows_usb.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h index d6d887b..99f386f 100644 --- a/libusb/os/poll_windows.h +++ b/libusb/os/poll_windows.h @@ -41,6 +41,7 @@ enum windows_version { WINDOWS_UNSUPPORTED, WINDOWS_XP, + WINDOWS_2003, // also includes XP 64 WINDOWS_VISTA_AND_LATER, }; extern enum windows_version windows_version; diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 251d162..b6fa222 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -433,6 +433,8 @@ static int windows_init(struct libusb_context *ctx) if ((GetVersionEx(&os_version) != 0) && (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT)) { if ((os_version.dwMajorVersion == 5) && (os_version.dwMinorVersion == 1)) { windows_version = WINDOWS_XP; + } else if ((os_version.dwMajorVersion == 5) && (os_version.dwMinorVersion == 2)) { + windows_version = WINDOWS_2003; // also includes XP 64 } else if (os_version.dwMajorVersion >= 6) { windows_version = WINDOWS_VISTA_AND_LATER; } |