Mercurial > mxe-octave

view src/log4cxx-4-mingw.definitions.patch @ 3589:780be3cf5995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-*: pcre=8.35, cloog=0.18.1, gmp=6.0.0, isl=0.12.2 * src/cloog.mk: update version 0.18.1. * src/gmp.mk: update version 6.0.0. * src/isl.mk: update version 0.12.2. * src/isl-1-fixes.patch: update patch for -no-undefined
author John Donoghue
date Fri, 25 Apr 2014 14:44:56 -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