diff options
author | Chris Dickens <christopher.a.dickens@gmail.com> | 2017-12-26 23:58:00 -0800 |
---|---|---|
committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2017-12-26 23:58:00 -0800 |
commit | 539a3230cff8aa3430d4948d377d2a9224302197 (patch) | |
tree | 7974a2ab0f02b37faf93c485fe4f106b9e7d07e4 | |
parent | 8aad7fd1de08c173ff0fec87abb85bd940526603 (diff) | |
download | libusb-539a3230cff8aa3430d4948d377d2a9224302197.tar.gz |
Misc: Fix testlibusb build on VS2013 and earlier and suppress warnings
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
-rwxr-xr-x | examples/testlibusb.c | 4 | ||||
-rw-r--r-- | libusb/version_nano.h | 2 | ||||
-rw-r--r-- | msvc/config.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/examples/testlibusb.c b/examples/testlibusb.c index df5bb84..893203a 100755 --- a/examples/testlibusb.c +++ b/examples/testlibusb.c @@ -21,6 +21,10 @@ #include <string.h> #include "libusb.h" +#if defined(_MSC_VER) && (_MSC_VER < 1900) +#define snprintf _snprintf +#endif + int verbose = 0; static void print_endpoint_comp(const struct libusb_ss_endpoint_companion_descriptor *ep_comp) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index bc3ae8f..0029bd2 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11230 +#define LIBUSB_NANO 11231 diff --git a/msvc/config.h b/msvc/config.h index dc9280e..7a374b3 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -12,10 +12,12 @@ /* Disable: warning C4200: nonstandard extension used : zero-sized array in struct/union */ #pragma warning(disable:4200) +/* Disable: warning C4324: structure was padded due to __declspec(align()) */ +#pragma warning(disable:4324) /* Disable: warning C6258: Using TerminateThread does not allow proper thread clean up */ -#pragma warning(disable: 6258) +#pragma warning(disable:6258) /* Disable: warning C4996: 'GetVersionA': was declared deprecated */ -#pragma warning(disable: 4996) +#pragma warning(disable:4996) #if defined(_PREFAST_) /* Disable "Banned API" errors when using the MS's WDK OACR/Prefast */ |