Mercurial > mxe-octave
annotate src/log4cxx-3-warnings.patch @ 6213:5f64fb928091 release
build-gcc: Avoid library clash when calling msgfmt.
* src/build-gcc-1-msgfmt.patch: Don't use libraries from the build tree when
calling `msgfmt`.
* dist-files.mk: Add patch to list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 06 May 2022 19:36:10 +0200 |
parents | 51a4ed33302d |
children |
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 Already applied to log4cxx trunk. |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
5 |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
6 diff -NBaur vanilla/src/main/include/log4cxx/helpers/objectptr.h mingw_cross/src/main/include/log4cxx/helpers/objectptr.h |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
7 --- vanilla/src/main/include/log4cxx/helpers/objectptr.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
|
8 +++ mingw_cross/src/main/include/log4cxx/helpers/objectptr.h 2011-05-09 10:30:03.767560165 +0900 |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
9 @@ -28,9 +28,9 @@ |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
10 // switching between the initialization styles. |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
11 // |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
12 #if LOG4CXX_HELGRIND |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
13 -#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x); |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
14 +#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
15 #else |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
16 -#define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) { |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
17 +#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) { |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
18 #endif |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
19 |
c5d8bb3beb28
new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff
changeset
|
20 namespace log4cxx |