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 /bus | |
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>
Diffstat (limited to 'bus')
-rw-r--r-- | bus/bus.c | 7 |
1 files changed, 1 insertions, 6 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) { |