view src/log4cxx-4-mingw.definitions.patch @ 3632:4e78b4a9e87c

Add libcdio,mpcdec, vcdimager, a52dec, wavpack from mxe_devel * dist-files.mk: add libcdio.mk,libmpcdec-1-configure_ac.patch,libmpcdec.mk, vcdimager-* * index.html: add libcdio, libmpcdec, a52dec, wavpack * src/libcdio.mk: new file * src/libmpcdec-1-configure_ac.patch: new file * src/libmpcdec.mk: new file * src/vcdimager-1-configure.patch: new file * src/vcdimager.mk: new file * src/a52dec.mk: new file * src/wavpack-1-exec_prefix.patch: new file * src/wavpack.mk: new file
author John Donoghue <john.donoghue@ieee.org>
date Mon, 30 Jun 2014 06:10:45 -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