annotate src/dcmtk-4-c++11-related-fixes.patch @ 5545:78a98ff1efd8

configure.ac: Default USE_SYSTEM_OCTAVE to MXE_NATIVE_BUILD (bug #49503).
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 02 Oct 2020 13:54:27 +0200
parents fb000475ca16
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5066
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
1 From: Boris Pek
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
2 Date: Thu, 05 May 2016 15:38:47 +0300
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
3 Subject: [PATCH] fix build with GCC >= 6.x
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
4
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
5 diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
6 --- a/ofstd/libsrc/ofstd.cc
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
7 +++ b/ofstd/libsrc/ofstd.cc
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
8 @@ -175,7 +175,7 @@
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
9
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
10
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
11 // some systems don't properly define isnan()
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
12 -#ifdef HAVE_ISNAN
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
13 +#if defined(HAVE_ISNAN) && (__cplusplus < 201103L)
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
14 #ifndef HAVE_PROTOTYPE_ISNAN
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
15 extern "C"
fb000475ca16 dcmtk: update patches/build
John Donoghue
parents:
diff changeset
16 {