From: Anthony Clay, ZarthCode LLC <anthony.clay@zarthcode.com>
Date: Sun, 19 Aug 2012 19:19:40 +0000 (-0500)
Subject: Windows: Fix C4005 warning under VS2012 for inline.
X-Git-Tag: upstream/1.0.21~603
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c86fb21a3b5e787975ead14afc46960492365282;p=platform%2Fupstream%2Flibusb.git

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.
---

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