Mercurial > mxe-octave

view src/log4cxx-4-mingw.definitions.patch @ 4066:0962acdde3be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
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