Mercurial > hg > orthanc
view Resources/Patches/dcmtk-3.6.0-mingw64.patch @ 2956:bfee0b9f3209
cont
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 03 Dec 2018 15:11:42 +0100 |
parents | 6d5e36e1256f |
children |
line wrap: on
line source
diff -urEb dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h --- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2010-12-17 11:50:30.000000000 +0100 +++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2013-07-19 15:56:25.688996134 +0200 @@ -196,7 +196,7 @@ OFBool popen(const char *command, const char *modes) { if (file_) fclose(); -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR) file_ = _popen(command, modes); #else file_ = :: popen(command, modes); @@ -258,7 +258,7 @@ { if (popened_) { -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR) result = _pclose(file_); #else result = :: pclose(file_);