This fix is limited to msvc compilers only.
Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
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)
{
#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
#include <pthread.h>
#endif
-#ifdef _MSC_VER
-#define inline
-#endif
#ifdef DBUS_USE_OUTPUT_DEBUG_STRING
static char module_name[1024];
#endif