blob: 0a943ad7c5e6c62cacc13dd0e86d62a3a8eb27c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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)
{
|
