Mercurial > mxe-octave

annotate src/log4cxx-4-mingw.definitions.patch @ 2465:c5d8bb3beb28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new packages: apr, apr-util, log4cxx
author Daniel Stonier <d.stonier@gmail.com>
date Wed, 02 May 2012 17:06:54 +1000
parents
children a7a203db74c5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2465
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
2 See doc/index.html for further information.
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
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
6 Not yet submitted upstream.
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
7
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
8 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
9 --- 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
10 +++ 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
11 @@ -23,9 +23,13 @@
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
12
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
13 #if !defined(LOG4CXX_THREAD_FUNC)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
14 #if defined(_WIN32)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
15 -#define LOG4CXX_THREAD_FUNC __stdcall
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
16 + #if defined(__MINGW32__)
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
17 + #define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
18 + #else
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
19 + #define LOG4CXX_THREAD_FUNC __stdcall
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
20 + #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
21 #else
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
22 -#define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
23 + #define LOG4CXX_THREAD_FUNC
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
24 #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
25 #endif
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
26