Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
2545:9f325c631973 2546:6d5e36e1256f
4 @@ -196,7 +196,7 @@ 4 @@ -196,7 +196,7 @@
5 OFBool popen(const char *command, const char *modes) 5 OFBool popen(const char *command, const char *modes)
6 { 6 {
7 if (file_) fclose(); 7 if (file_) fclose();
8 -#ifdef _WIN32 8 -#ifdef _WIN32
9 +#if 0 9 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
10 file_ = _popen(command, modes); 10 file_ = _popen(command, modes);
11 #else 11 #else
12 file_ = :: popen(command, modes); 12 file_ = :: popen(command, modes);
13 @@ -258,7 +258,7 @@ 13 @@ -258,7 +258,7 @@
14 { 14 {
15 if (popened_) 15 if (popened_)
16 { 16 {
17 -#ifdef _WIN32 17 -#ifdef _WIN32
18 +#if 0 18 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
19 result = _pclose(file_); 19 result = _pclose(file_);
20 #else 20 #else
21 result = :: pclose(file_); 21 result = :: pclose(file_);
22 Only in dcmtk-3.6.0/ofstd/include/dcmtk/ofstd: offile.h~