diff options
| author | Daniel Stonier <d.stonier@gmail.com> | 2012-05-02 07:06:54 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-05-02 07:06:54 (GMT) |
| commit | 1940a74145dbbe86243068d63312667dd0b46111 (patch) | |
| tree | 2b8a5ddb6e905d3278a991b3d47635b963b175f1 /src/log4cxx-4-mingw.definitions.patch | |
| parent | ae7bd20d37d539dc35a2d9b549320321a1802264 (diff) | |
| download | mxe-1940a74145dbbe86243068d63312667dd0b46111.zip mxe-1940a74145dbbe86243068d63312667dd0b46111.tar.gz mxe-1940a74145dbbe86243068d63312667dd0b46111.tar.bz2 | |
new packages: apr, apr-util, log4cxx
Diffstat (limited to 'src/log4cxx-4-mingw.definitions.patch')
| -rw-r--r-- | src/log4cxx-4-mingw.definitions.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/log4cxx-4-mingw.definitions.patch b/src/log4cxx-4-mingw.definitions.patch new file mode 100644 index 0000000..2e1b1eb --- /dev/null +++ b/src/log4cxx-4-mingw.definitions.patch @@ -0,0 +1,26 @@ +This file is part of mingw-cross-env. +See doc/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 +Not yet submitted upstream. + +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 + |