From 0b9a508f4f7c4a38986b23ba0f31bb606df42a77 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 2 Sep 2013 17:39:37 +0100
Subject: [PATCH 8/8] dbus-sysdeps-win.h: do not redefine _inline if not
 already defined

mingw-w64 3.0~svn5915 defines it to __inline, provoking a
redefinition warning.

It looks as though this was probably just a workaround for a broken
mingw version of wspiapi.h anyway?
---
 dbus/dbus-sysdeps-win.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index a77e5b5..5d0ea0f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -79,12 +79,14 @@ extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
 
 #ifdef HAVE_WSPIAPI_H
 // needed for w2k compatibility (getaddrinfo/freeaddrinfo/getnameinfo)
-#ifdef __GNUC__
-#define _inline
-#include "wspiapi.h"
-#else
-#include <wspiapi.h>
-#endif
+# ifdef __GNUC__
+#   ifndef _inline
+#     define _inline
+#   endif
+#   include "wspiapi.h"
+# else
+#   include <wspiapi.h>
+# endif
 #endif // HAVE_WSPIAPI_H
 
 #ifndef O_BINARY
-- 
1.8.4.rc3