Mercurial > mxe-octave
view src/log4cxx-4-mingw.definitions.patch @ 3629:5aba05f2226e
update xine-lib, add mman-win32
* dist-files.mk: add mman-win32-1-include_name_change.patch, mman-win32.mk, add xine-lib-*.patch files.
* index.html: add mman-win32
* src/mman-win32-1-include_name_change.patch: new file.
* src/mman-win32.mk: new file.
* src/xine-lib-1-configure_ac.patch: new file
* src/xine-lib-1-fixes.patch: removed
* src/xine-lib-2-build_fixes.patch: new file.
* src/xine-lib-3-more_build_fixes.patch: new file
* src/xine-lib-4-mkdir.patch: new file.
* src/xine-lib-5-change_mma_h_to_mma_win32_h.patch: new file
* src/xine-lib.mk: update version
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 29 Jun 2014 15:46:35 -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