summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Batard <pete@akeo.ie>2012-04-10 13:05:37 +0100
committerPeter Stuge <peter@stuge.se>2012-04-20 08:12:33 +0200
commit3c7f85a49b42ac36c6d41294858518c554ac4694 (patch)
treedc58bf3ac965032c82f2fd4680b03b1baefe1e9b
parenteb55963a6b33799ea76c34f538f21e86f235ea62 (diff)
downloadlibusb-3c7f85a49b42ac36c6d41294858518c554ac4694.tar.gz
Windows: Silence warning about unused function guid_to_string()
Commit 6b1982b1bd321b55698ce537e64648e8aec85f6f removed the #ifdef around guid_to_string() but this ended up causing a warning when the function wasn't being called. Add it back with correct _MSC_VER. libusbx.git commit 24d595aa71e7fd0f14d40e933a33f852f7269c8b [stuge: Rewrite commit message for libusb.git]
-rw-r--r--libusb/os/windows_usb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 47f6dec..89bd356 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -122,6 +122,7 @@ static inline BOOLEAN guid_eq(const GUID *guid1, const GUID *guid2) {
return false;
}
+#if defined(ENABLE_DEBUG_LOGGING) || (defined(_MSC_VER) && _MSC_VER < 1400)
static char* guid_to_string(const GUID* guid)
{
static char guid_string[MAX_GUID_STRING_LENGTH];
@@ -133,6 +134,7 @@ static char* guid_to_string(const GUID* guid)
guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
return guid_string;
}
+#endif
/*
* Converts a windows error to human readable string