Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3633
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 Patch for the fact we are using the mingw-w64 with mingw32 compiler
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 diff -ur dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 --- dcmtk-3.6.0.orig/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:23:34.314366353 -0400
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 +++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h 2014-06-30 12:29:57.079959273 -0400
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 @@ -81,7 +81,7 @@
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 typedef __int64 offile_off_t;
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 typedef fpos_t offile_fpos_t;
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 #else
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 - #ifdef EXPLICIT_LFS_64
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 + #if defined(EXPLICIT_LFS_64) && !defined(__MINGW64__) && !defined(__MINGW32__)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 // Explicit LFS (LFS64)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 typedef fpos64_t offile_fpos_t;
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 typedef off64_t offile_off_t;
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 @@ -196,7 +196,7 @@
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 OFBool popen(const char *command, const char *modes)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 {
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 if (file_) fclose();
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 -#ifdef _WIN32
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 file_ = _popen(command, modes);
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 #else
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 file_ = :: popen(command, modes);
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -258,7 +258,7 @@
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 {
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 if (popened_)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 {
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 -#ifdef _WIN32
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 +#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 result = _pclose(file_);
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 #else
d56a56e41d43 dcmtk: fix mingw compile
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 result = :: pclose(file_);