summaryrefslogtreecommitdiff
path: root/libusb/os/windows_winusb.h
diff options
context:
space:
mode:
authorChris Dickens <christopher.a.dickens@gmail.com>2020-01-25 12:10:04 -0800
committerChris Dickens <christopher.a.dickens@gmail.com>2020-01-25 12:10:04 -0800
commit7bc0ff3ce94572f3e52718938e4beb4c7a86bfff (patch)
treed94640a7edf402b2373b5cc4cfb84881e9c4bfb6 /libusb/os/windows_winusb.h
parent221e8196221a6ede462914daf6c2652d57843df6 (diff)
downloadlibusb-7bc0ff3ce94572f3e52718938e4beb4c7a86bfff.tar.gz
core: Convert internal macros to static inline functions
Older versions of the Visual Studio compiler are picky about macros constructed with the 'do { ... } while (0)' construct. Convert these internal ones to static inline functions. The result is functionally equivalent but gets us type checking and a bit more readability. Also address some compiler warnings due to some header files that are being included in a different order than before. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/os/windows_winusb.h')
-rw-r--r--libusb/os/windows_winusb.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index 245b137..6ac39c3 100644
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -27,12 +27,8 @@
#if defined(_MSC_VER)
// disable /W4 MSVC warnings that are benign
-#pragma warning(disable:4100) // unreferenced formal parameter
-#pragma warning(disable:4127) // conditional expression is constant
#pragma warning(disable:4201) // nameless struct/union
#pragma warning(disable:4214) // bit field types other than int
-#pragma warning(disable:4996) // deprecated API calls
-#pragma warning(disable:28159) // more deprecated API calls
#endif
// Missing from MSVC6 setupapi.h