1 files changed, 38 insertions, 6 deletions
diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch
index 41878d9..79db32a 100644
--- a/src/dbus-1-fixes.patch
+++ b/src/dbus-1-fixes.patch
@@ -1,17 +1,19 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
-From 7241e09abbfc2021f2a7e5cbded70222023fa7e6 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
+Contains ad hoc patches for cross building.
+
+From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
 Date: Tue, 4 Jan 2011 00:47:49 +0100
-Subject: [PATCH 1/1] always static in mingw-cross-env
+Subject: [PATCH 1/2] always static in mingw-cross-env
 
 
 diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
-index d1e40ec..3a32355 100644
+index dcd3eeb..8324278 100644
 --- a/dbus/dbus-macros.h
 +++ b/dbus/dbus-macros.h
-@@ -158,6 +158,7 @@
+@@ -172,6 +172,7 @@
   */
  
  #if defined(_WIN32)
@@ -20,5 +22,35 @@ index d1e40ec..3a32355 100644
  #  define DBUS_EXPORT
  #  elif defined(dbus_1_EXPORTS)
 -- 
-1.7.1
+1.7.6.3
+
+
+From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Fri, 23 Sep 2011 16:24:46 +0200
+Subject: [PATCH 2/2] add missing MemoryBarrier (mingw-cross-env specific)
+
+Windows API has this, but it's not in MinGW.
+See http://lists-archives.org/mingw-users/15935-missing-definition-of-memorybarrier.html
+
+diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
+index b492b09..082225f 100644
+--- a/dbus/dbus-sysdeps-win.c
++++ b/dbus/dbus-sysdeps-win.c
+@@ -55,6 +55,13 @@
+ #include <ws2tcpip.h>
+ #include <wincrypt.h>
+ 
++__CRT_INLINE VOID MemoryBarrier(VOID)
++{
++  LONG Barrier = 0;
++  __asm__ __volatile__("xchgl %%eax,%0 "
++    :"=r" (Barrier));
++}
++
+ /* Declarations missing in mingw's headers */
+ extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR  StringSid, PSID *Sid);
+ extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
+-- 
+1.7.6.3