Mercurial > hg > orthanc

diff Resources/Patches/dcmtk-3.6.0-mingw64.patch @ 2546:6d5e36e1256f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Apr 2018 19:19:27 +0200
parents 01de36d949c3
children
line wrap: on
line diff
--- a/Resources/Patches/dcmtk-3.6.0-mingw64.patch	Tue Apr 17 21:01:08 2018 +0200
+++ b/Resources/Patches/dcmtk-3.6.0-mingw64.patch	Tue Apr 17 19:19:27 2018 +0200
@@ -6,7 +6,7 @@
    {
      if (file_) fclose();
 -#ifdef _WIN32
-+#if 0
++#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
      file_ = _popen(command, modes);
  #else
      file_ = :: popen(command, modes);
@@ -15,8 +15,7 @@
        if (popened_)
        {
 -#ifdef _WIN32
-+#if 0
++#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
          result = _pclose(file_);
  #else
          result = :: pclose(file_);
-Only in dcmtk-3.6.0/ofstd/include/dcmtk/ofstd: offile.h~