32 lines · 892 B · Text
RawDownload
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 2001From: darealshinji <djcj@gmx.de>Date: Mon, 3 Jul 2017 01:55:45 +0200Subject: [PATCH 1/1] Avoid multiple definitions of DllMain in static builds  diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.cindex 1111111..2222222 100644--- a/dbus/dbus-sysdeps-thread-win.c+++ b/dbus/dbus-sysdeps-thread-win.c@@ -84,6 +84,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 */@@ -122,6 +124,8 @@ DllMain (hinst_t hinstDLL,   return TRUE; } +#endif /* !DBUS_STATIC_BUILD */+ DBusCMutex * _dbus_platform_cmutex_new (void) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t