Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/dcmtk-3.6.0-mingw64.patch @ 4044:d25f4c0fa160 framework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
splitting code into OrthancFramework and OrthancServer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jun 2020 20:30:34 +0200
parents Resources/Patches/dcmtk-3.6.0-mingw64.patch@6d5e36e1256f
children
comparison
equal deleted inserted replaced
4043:6c6239aec462 4044:d25f4c0fa160
1 diff -urEb dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h
2 --- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2010-12-17 11:50:30.000000000 +0100
3 +++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2013-07-19 15:56:25.688996134 +0200
4 @@ -196,7 +196,7 @@
5 OFBool popen(const char *command, const char *modes)
6 {
7 if (file_) fclose();
8 -#ifdef _WIN32
9 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
10 file_ = _popen(command, modes);
11 #else
12 file_ = :: popen(command, modes);
13 @@ -258,7 +258,7 @@
14 {
15 if (popened_)
16 {
17 -#ifdef _WIN32
18 +#if defined(_WIN32) && !defined(__MINGW64_VERSION_MAJOR)
19 result = _pclose(file_);
20 #else
21 result = :: pclose(file_);