Mercurial > mxe-octave

comparison src/dbus-1-fixes.patch @ 3108:acee522701c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable dbus compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Fri, 28 Jun 2013 21:14:15 -0400
parents 0c267ecd6ee6
children
comparison
equal deleted inserted replaced
3107:fcfbd9fe9d6d 3108:acee522701c0
13 13
14 diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c 14 diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
15 index b492b09..082225f 100644 15 index b492b09..082225f 100644
16 --- a/dbus/dbus-sysdeps-win.c 16 --- a/dbus/dbus-sysdeps-win.c
17 +++ b/dbus/dbus-sysdeps-win.c 17 +++ b/dbus/dbus-sysdeps-win.c
18 @@ -55,6 +55,13 @@ 18 @@ -55,6 +55,15 @@
19 #include <ws2tcpip.h> 19 #include <ws2tcpip.h>
20 #include <wincrypt.h> 20 #include <wincrypt.h>
21 21
22 +#ifdef __GNUC__
22 +__CRT_INLINE VOID MemoryBarrier(VOID) 23 +__CRT_INLINE VOID MemoryBarrier(VOID)
23 +{ 24 +{
24 + LONG Barrier = 0; 25 + LONG Barrier = 0;
25 + __asm__ __volatile__("xchgl %%eax,%0 " 26 + __asm__ __volatile__("xchgl %%eax,%0 "
26 + :"=r" (Barrier)); 27 + :"=r" (Barrier));
27 +} 28 +}
29 +#endif
28 + 30 +
29 /* Declarations missing in mingw's headers */ 31 /* Declarations missing in mingw's headers */
30 extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid); 32 extern BOOL WINAPI ConvertStringSidToSidA (LPCSTR StringSid, PSID *Sid);
31 extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid); 33 extern BOOL WINAPI ConvertSidToStringSidA (PSID Sid, LPSTR *StringSid);
32 -- 34 --