annotate Resources/Patches/dcmtk-3.6.4.patch @ 3280:fddf3ceed7e5

fixing lsb and msvc builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 15:46:13 +0100
parents
children ea54109a7312
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3280
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:30:21.657110805 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc 2019-02-21 15:41:01.565099612 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -28,6 +28,7 @@
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 #include "dcmtk/ofstd/ofstdinc.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #include "dcmtk/ofstd/ofstream.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +#include "dcmtk/ofstd/oflimits.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 #include "dcmtk/dcmdata/dcpxitem.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 #include "dcmtk/dcmdata/dcswap.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 #include "dcmtk/ofstd/ofstring.h"
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 --- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:21.645110805 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 +++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h 2019-02-21 15:30:48.273110339 +0100
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 @@ -575,7 +575,7 @@
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 */
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 void setlinebuf()
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 {
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 -#if defined(_WIN32) || defined(__hpux)
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 +#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 this->setvbuf(NULL, _IOLBF, 0);
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #else
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 :: setlinebuf(file_);
fddf3ceed7e5 fixing lsb and msvc builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 Only in dcmtk-3.6.4/ofstd/include/dcmtk/ofstd: offile.h~