diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-11-24 01:14:45 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-11-24 01:14:45 (GMT) |
| commit | 7f999d67ec6891fbd7a97d32f76fb718660ff1d4 (patch) | |
| tree | e55cd765f109fc06bfd9a98a556ff672d15f5767 /src | |
| parent | cf5b4ee81f8d4f2e25026c27958b6ae26011fcd3 (diff) | |
| download | mxe-7f999d67ec6891fbd7a97d32f76fb718660ff1d4.zip mxe-7f999d67ec6891fbd7a97d32f76fb718660ff1d4.tar.gz mxe-7f999d67ec6891fbd7a97d32f76fb718660ff1d4.tar.bz2 | |
log4cxx: fix build with latest apr update
Diffstat (limited to 'src')
| -rw-r--r-- | src/log4cxx-4-cmake.patch (renamed from src/log4cxx-5-cmake.patch) | 0 | ||||
| -rw-r--r-- | src/log4cxx-4-mingw.definitions.patch | 28 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/log4cxx-5-cmake.patch b/src/log4cxx-4-cmake.patch index 7628fb6..7628fb6 100644 --- a/src/log4cxx-5-cmake.patch +++ b/src/log4cxx-4-cmake.patch diff --git a/src/log4cxx-4-mingw.definitions.patch b/src/log4cxx-4-mingw.definitions.patch deleted file mode 100644 index 3022926..0000000 --- a/src/log4cxx-4-mingw.definitions.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - |