From 4a3e5b0af4046c602c98729a35786273f043bb09 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 13 Aug 2011 22:08:26 +0200
Subject: Fix compilation on MSVC, which doesn't understand "inline" with its
 C99 meaning. This fix is limited to msvc compilers only.

Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
---
 cmake/config.h.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cmake')

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index aa2343ca..b4bfc802 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -253,10 +253,8 @@
 #define _dbus_verbose_C_S _dbus_verbose
 #endif 
 
-#ifdef _MSC_VER
-#define DBUS_INLINE __inline
-#else
-#define DBUS_INLINE inline
+# if defined(_MSC_VER) && !defined(inline)
+#define inline __inline
 #endif
 
 #endif  // _DBUS_CONFIG_H
-- 
cgit v1.2.1