Mercurial > mxe-octave
view src/log4cxx-4-mingw.definitions.patch @ 6113:24e29dcb2e64
Qt5: Update to version 5.15.3.
* src/qtbase.mk: Update version and checksum.
* src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied
upstream.
* src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk:
Update checksum.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 05 Mar 2022 10:59:53 +0100 |
| parents | ebacbf52f15c |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. Fixes a problem with the mismatched calling conventions in apr and log4cxx. See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html Submitted upstream: https://issues.apache.org/jira/browse/LOGCXX-382 diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h --- vanilla/src/main/include/log4cxx/helpers/thread.h 2008-04-01 07:34:26.000000000 +0900 +++ mingw_cross/src/main/include/log4cxx/helpers/thread.h 2011-05-09 11:08:23.123558232 +0900 @@ -23,9 +23,13 @@ #if !defined(LOG4CXX_THREAD_FUNC) #if defined(_WIN32) -#define LOG4CXX_THREAD_FUNC __stdcall + #if defined(__MINGW32__) + #define LOG4CXX_THREAD_FUNC + #else + #define LOG4CXX_THREAD_FUNC __stdcall + #endif #else -#define LOG4CXX_THREAD_FUNC + #define LOG4CXX_THREAD_FUNC #endif #endif