summaryrefslogtreecommitdiff
path: root/bus
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2011-08-05 23:01:10 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2011-08-05 23:01:10 +0200
commitb0b5f9b1346dbc003b854b2861e7c3b70dac89f2 (patch)
treeed4dcf5512687506a8ba3e3c5a2343f484381061 /bus
parent2a6c14cd2ed739f3ff2e5ecb605c9b56c2f0a7a0 (diff)
downloaddbus-b0b5f9b1346dbc003b854b2861e7c3b70dac89f2.tar.gz
Win32 compile fix.
msvc compilers define 'inline' only for c++ code, so wrap it with a platform independent DBUS_INLINE define in cmake generated config.h.
Diffstat (limited to 'bus')
-rw-r--r--bus/bus.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/bus/bus.c b/bus/bus.c
index 6b0dc088..f805e3fa 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1320,7 +1320,12 @@ out:
va_end (args);
}
-static inline const char *
+/* TODO: move to autotools generated config.h like done in cmake */
+#ifndef DBUS_INLINE
+#define DBUS_INLINE inline
+#endif
+
+static DBUS_INLINE const char *
nonnull (const char *maybe_null,
const char *if_null)
{