summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Mot <alexander@amot.dev>2022-08-08 10:06:10 -0700
committerTormod Volden <debian.tormod@gmail.com>2023-01-07 00:19:04 +0100
commitb09074ea77cf39da31554cfc816d76b837fb26b7 (patch)
tree4f4f1357791c422b589edd163c5c1466fa73d02b
parentd014a11545115004a7e74e4a060ec6cd97f3a5de (diff)
downloadlibusb-b09074ea77cf39da31554cfc816d76b837fb26b7.tar.gz
windows: Define __func__ for vs2015
The __func__ macro is defined by the C99 standard (but not C++99/03). The default C compiler in msvc implements C89, plus Microsoft extensions, some of which are part of C99. It appears that both vs2013 and vs2015 don't define __func__. Closes #1170
-rw-r--r--libusb/version_nano.h2
-rw-r--r--msvc/config.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index f30d8ef..dea5b36 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11757
+#define LIBUSB_NANO 11758
diff --git a/msvc/config.h b/msvc/config.h
index 8aafd9d..12313c1 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -10,8 +10,8 @@
#error "Visual Studio 2013 or later is required."
#endif
-/* Visual Studio 2013 does not support __func__ */
-#if (_MSC_VER < 1900)
+/* Visual Studio 2013 and 2015 do not support __func__ */
+#if (_MSC_VER <= 1900)
#define __func__ __FUNCTION__
#endif