Mercurial > mxe-octave
view src/dbus-1-fixes.patch @ 2353:99516e73b368
Move doc/index.html -> index.html
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Thu, 29 Mar 2012 12:14:15 +0200 |
parents | f653602a0500 |
children | 0c267ecd6ee6 |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 9c99802fc9d0e3b2c90b00ba877ae8be9bab615f Mon Sep 17 00:00:00 2001 From: MXE Date: Tue, 4 Jan 2011 00:47:49 +0100 Subject: [PATCH 1/2] always static in MXE diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h index dcd3eeb..8324278 100644 --- a/dbus/dbus-macros.h +++ b/dbus/dbus-macros.h @@ -172,6 +172,7 @@ */ #if defined(_WIN32) +# define DBUS_STATIC_BUILD # if defined(DBUS_STATIC_BUILD) # define DBUS_EXPORT # elif defined(dbus_1_EXPORTS) -- 1.7.6.3 From d7bc1aff67132c09d154999c282e1b391bbe7a39 Mon Sep 17 00:00:00 2001 From: MXE Date: Fri, 23 Sep 2011 16:24:46 +0200 Subject: [PATCH 2/2] add missing MemoryBarrier (MXE 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