Mercurial > mxe-octave

comparison src/dcmtk-2-ming64.patch @ 3633:d56a56e41d43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dcmtk: fix mingw compile * src/dcmtk-2-ming64.patch: new file * dist-files.mk: added dcmtk-2-ming64.patch
author John Donoghue <john.donoghue@ieee.org>
date Mon, 30 Jun 2014 20:04:58 -0400
parents
children
comparison
equal deleted inserted replaced
3632:4e78b4a9e87c 3633:d56a56e41d43
1 Patch for the fact we are using the mingw-w64 with mingw32 compiler
2
3 diff -ur dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h
4 --- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:23:34.314366353 -0400
5 +++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:29:57.079959273 -0400
6 @@ -81,7 +81,7 @@
7 typedef __int64 offile_off_t;
8 typedef fpos_t offile_fpos_t;
9 #else
10 - #ifdef EXPLICIT_LFS_64
11 + #if defined(EXPLICIT_LFS_64) && !defined(__MINGW64__) && !defined(__MINGW32__)
12 // Explicit LFS (LFS64)
13 typedef fpos64_t offile_fpos_t;
14 typedef off64_t offile_off_t;
15 @@ -196,7 +196,7 @@
16 OFBool popen(const char *command, const char *modes)
17 {
18 if (file_) fclose();
19 -#ifdef _WIN32
20 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
21 file_ = _popen(command, modes);
22 #else
23 file_ = :: popen(command, modes);
24 @@ -258,7 +258,7 @@
25 {
26 if (popened_)
27 {
28 -#ifdef _WIN32
29 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
30 result = _pclose(file_);
31 #else
32 result = :: pclose(file_);