diff options
| author | mabrand <mabrand@mabrand.nl> | 2017-07-04 20:15:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 20:15:29 (GMT) |
| commit | 2a13a1db3b83fcb5fadb4d6e28ff3d780b2f2e30 (patch) | |
| tree | 7927f4f9bed20c519e9b46284af64d0acebcfceb /src | |
| parent | 14f0ed00cb152975f7ec71f2812d4c37f75bb469 (diff) | |
| parent | 75832a92a4217373a52d0d8776c1f29806d34aee (diff) | |
| download | mxe-2a13a1db3b83fcb5fadb4d6e28ff3d780b2f2e30.zip mxe-2a13a1db3b83fcb5fadb4d6e28ff3d780b2f2e30.tar.gz mxe-2a13a1db3b83fcb5fadb4d6e28ff3d780b2f2e30.tar.bz2 | |
Merge pull request #1803 from darealshinji/dbus
dbus: avoid multiple definitions of DllMain in static builds
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus-1-fixes.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/dbus-1-fixes.patch b/src/dbus-1-fixes.patch new file mode 100644 index 0000000..0a943ad --- /dev/null +++ b/src/dbus-1-fixes.patch @@ -0,0 +1,32 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Mon, 3 Jul 2017 01:55:45 +0200 +Subject: [PATCH] Avoid multiple definitions of DllMain in static builds + + +diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c +index 1111111..2222222 100644 +--- a/dbus/dbus-sysdeps-thread-win.c ++++ b/dbus/dbus-sysdeps-thread-win.c +@@ -69,6 +69,8 @@ _dbus_win_get_dll_hmodule (void) + #define hinst_t HINSTANCE + #endif + ++#ifndef DBUS_STATIC_BUILD ++ + BOOL WINAPI DllMain (hinst_t, DWORD, LPVOID); + + /* We need this to free the TLS events on thread exit */ +@@ -107,6 +109,8 @@ DllMain (hinst_t hinstDLL, + return TRUE; + } + ++#endif /* !DBUS_STATIC_BUILD */ ++ + DBusCMutex * + _dbus_platform_cmutex_new (void) + { |