summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2014-05-20 20:42:54 +0100
committerPete Batard <pete@akeo.ie>2014-05-20 20:42:54 +0100
commit6d5e7ec80045f1af400e7a84ec2ad7630573ce96 (patch)
tree0df722e521bfee79869b051e9398d84290d07180
parent5e77b8838b2a7d3a850ae6e532727fcf5dbaef1e (diff)
downloadlibusb-6d5e7ec80045f1af400e7a84ec2ad7630573ce96.tar.gz
Windows: fix broken WDK compilation for XP targets
* On XP environments, the call to GetSystemMetrics() fails without an explicit reference to user.lib... which end user applications would also need to do. Considering that this call was just to differentiate Windows 2003 from 2003 R2, just remove it.
-rw-r--r--libusb/os/windows_usb.c2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 19b2542..6c42971 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -879,7 +879,7 @@ static void get_windows_version(void)
break;
case 0x51: w = "XP";
break;
- case 0x52: w = (!GetSystemMetrics(89)?"2003":"2003_R2");
+ case 0x52: w = ("2003");
break;
case 0x60: w = (ws?"Vista":"2008");
break;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 2e102e9..70e0559 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10893
+#define LIBUSB_NANO 10894