Mercurial > mxe-octave

annotate src/log4cxx-4-mingw.definitions.patch @ 5534:372ea4c0afb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents ebacbf52f15c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2466
a7a203db74c5 packages apr, apr-util, log4cxx: various changes and add log4cxx test program
Tony Theodore <tonyt@logyst.com>
parents: 2465
diff changeset
1 This file is part of MXE.
2469
51a4ed33302d various packages: fix references to mingw-cross-env and doc/index.html
Tony Theodore <tonyt@logyst.com>
parents: 2466
diff changeset
2 See index.html for further information.
2465
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
3
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
4 Fixes a problem with the mismatched calling conventions in apr and log4cxx.
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
5 See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html
2470
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
6 Submitted upstream:
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
7
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
8 https://issues.apache.org/jira/browse/LOGCXX-382
2465
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
9
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
10 diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
11 --- vanilla/src/main/include/log4cxx/helpers/thread.h 2008-04-01 07:34:26.000000000 +0900
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
12 +++ mingw_cross/src/main/include/log4cxx/helpers/thread.h 2011-05-09 11:08:23.123558232 +0900
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
13 @@ -23,9 +23,13 @@
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
14
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
15 #if !defined(LOG4CXX_THREAD_FUNC)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
16 #if defined(_WIN32)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
17 -#define LOG4CXX_THREAD_FUNC __stdcall
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
18 + #if defined(__MINGW32__)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
19 + #define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
20 + #else
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
21 + #define LOG4CXX_THREAD_FUNC __stdcall
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
22 + #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
23 #else
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
24 -#define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
25 + #define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
26 #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
27 #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
28