diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-08-13 22:08:26 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-08-13 22:08:26 +0200 |
| commit | 4a3e5b0af4046c602c98729a35786273f043bb09 (patch) | |
| tree | cd93e2ed87184967e76c8a87fe28ebb76cd82ef6 | |
| parent | 486c0373f120881917638072944dbdc6ad08ece8 (diff) | |
| download | dbus-4a3e5b0af4046c602c98729a35786273f043bb09.tar.gz | |
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>
| -rw-r--r-- | bus/bus.c | 7 | ||||
| -rw-r--r-- | cmake/config.h.cmake | 6 | ||||
| -rw-r--r-- | dbus/dbus-internals.c | 3 |
3 files changed, 3 insertions, 13 deletions
@@ -1320,12 +1320,7 @@ out: va_end (args); } -/* TODO: move to autotools generated config.h like done in cmake */ -#ifndef DBUS_INLINE -#define DBUS_INLINE inline -#endif - -static DBUS_INLINE const char * +static inline const char * nonnull (const char *maybe_null, const char *if_null) { 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 diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index 5e864ce3..95a491f9 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -301,9 +301,6 @@ static dbus_bool_t verbose = TRUE; #include <pthread.h> #endif -#ifdef _MSC_VER -#define inline -#endif #ifdef DBUS_USE_OUTPUT_DEBUG_STRING static char module_name[1024]; #endif |