Mercurial > mxe-octave
view src/dbus-1-fixes.patch @ 5518:039563087c70 octave-rc-6.0.90
update version number for first 6.1 release candidate
* src/stable-octave.mk: Update version to 6.0.90.
* src/release-octave.mk: Update version to 6.0.90. Update URL and
checksum for release candidate.
* src/release-octave-1-setvbuf.patch: Delete.
* src/release-octave-1-gnulib.patch: Update.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Aug 2020 15:48:45 -0400 |
parents | 4c5a70572b2b |
children |
line wrap: on
line source
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 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.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) {