summaryrefslogtreecommitdiff
path: root/bus
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2011-08-13 22:08:26 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2011-08-13 22:08:26 +0200
commit4a3e5b0af4046c602c98729a35786273f043bb09 (patch)
treecd93e2ed87184967e76c8a87fe28ebb76cd82ef6 /bus
parent486c0373f120881917638072944dbdc6ad08ece8 (diff)
downloaddbus-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.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/bus/bus.c b/bus/bus.c
index f805e3fa..6b0dc088 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -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)
{