Mercurial > hg > orthanc

view Resources/Patches/dcmtk-3.6.4.patch @ 3586:732922e48937

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added build instructions for MSVC 2017 and 2019
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 02 Dec 2019 11:32:21 +0100
parents ea54109a7312
children 0301f59450fe
line wrap: on
line source

diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
--- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc	2019-02-21 15:30:21.657110805 +0100
+++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc	2019-02-21 16:28:43.721049550 +0100
@@ -36,6 +36,9 @@
 #include "dcmtk/dcmdata/dcostrma.h"    /* for class DcmOutputStream */
 #include "dcmtk/dcmdata/dcwcache.h"    /* for class DcmWriteCache */
 
+#undef max
+#include "dcmtk/ofstd/oflimits.h"
+
 
 // ********************************
 
diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
--- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:21.645110805 +0100
+++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:48.273110339 +0100
@@ -575,7 +575,7 @@
    */
   void setlinebuf()
   {
-#if defined(_WIN32) || defined(__hpux)
+#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
     this->setvbuf(NULL, _IOLBF, 0);
 #else
     :: setlinebuf(file_);
Only in dcmtk-3.6.4/ofstd/include/dcmtk/ofstd: offile.h~