blob: 2e1b1ebe9fef2bba3a0aaf50da92f172c8d1f022 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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
|
