diff options
| author | Anthony Clay, ZarthCode LLC <anthony.clay@zarthcode.com> | 2012-08-19 14:19:40 -0500 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2012-08-20 01:14:44 +0100 |
| commit | c86fb21a3b5e787975ead14afc46960492365282 (patch) | |
| tree | 829b49c313c958d8030492de5c6fd1a60bb43a46 | |
| parent | d53c599d0b1f9cd04af4ce788de3e3e41a7591a0 (diff) | |
Windows: Fix C4005 warning under VS2012 for inline.
* Changed inline macro to not fire when using Visual Studio/C++,
which attempts to redefine the macro - resulting in a C4005 warning.
| -rw-r--r-- | libusb/libusb.h | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libusb/libusb.h b/libusb/libusb.h index 1dc12f8..de31a56 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -23,7 +23,9 @@ #ifdef _MSC_VER /* on MS environments, the inline keyword is available in C++ only */ +#if !defined(__cplusplus) #define inline __inline +#endif /* ssize_t is also not available (copy/paste from MinGW) */ #ifndef _SSIZE_T_DEFINED #define _SSIZE_T_DEFINED diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 1582ec7..c349cc2 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10548 +#define LIBUSB_NANO 10549 |