Author: tschoening
Date: Sun Feb 9 18:13:41 2014
New Revision: 1566340
URL: http://svn.apache.org/r1566340
Log:
LOGCXX-382: Mingw build type conversion error
Modified:
incubator/log4cxx/trunk/src/changes/changes.xml
incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1566340&r1=1566339&r2=1566340&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Sun Feb 9 18:13:41 2014
@@ -60,6 +60,7 @@
<action issue="LOGCXX-366" type="fix">Errors when
compile log4cxx 0.10.0 under Win7 x64 with Visual Studio 2010 (due to Christian
Boos and Feng Nan)</action>
<action issue="LOGCXX-367" type="fix">Build fails on
Linux with g++ 4.4</action>
<action issue="LOGCXX-381" type="fix">Pkgconfig can't
find dependencies properly if log4cxx built statically</action>
+ <action issue="LOGCXX-382" type="fix">Mingw build type
conversion error</action>
<action issue="LOGCXX-413" type="fix">log4cxx doesn't
compile on openembedded (due to Alex Zbarcea)</action>
<action issue="LOGCXX-414" type="fix">possibly wrong
use of autotools docdir (due to Alex Zbarcea)</action>
<action issue="LOGCXX-415" type="fix">Empty XML
configuration file causes crash</action>
Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h?rev=1566340&r1=1566339&r2=1566340&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h (original)
+++ incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h Sun Feb
9 18:13:41 2014
@@ -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
