Mercurial > mxe-octave
view src/log4cxx-4-mingw.definitions.patch @ 4734:80461a9e516c
override default xerbla with version from Octave
* mingw-blas-1-xerbla.patch, blas.mk: Build default libxerbla lib.
* mingw-lapack-1-xerbla.patch, lapack.mk: Use external libxerbla.
* mingw-openblas-1-xerbla.patch, openblas.mk: Likewise.
* src/qrupdate-1-fixes.patch: Likewise.
* default-octave.mk: Also install libxerbla.dll as libxerbla-octave.dll.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 21 Jun 2018 01:32:10 -0400 |
| 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