# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1404173098 14400
# Node ID d56a56e41d43b97d2aca55df3d0ed7307d7a4476
# Parent  4e78b4a9e87c752f377dd4238a1bdad060e75d18
dcmtk: fix mingw compile

* src/dcmtk-2-ming64.patch: new file

* dist-files.mk: added dcmtk-2-ming64.patch

diff -r 4e78b4a9e87c -r d56a56e41d43 dist-files.mk
--- a/dist-files.mk	Mon Jun 30 06:10:45 2014 -0400
+++ b/dist-files.mk	Mon Jun 30 20:04:58 2014 -0400
@@ -53,6 +53,7 @@
   curl.mk \
   dbus.mk \
   dcmtk-1-fixes.patch \
+  dcmtk-2-ming64.patch \
   dcmtk.mk \
   devil-1-png.patch \
   devil.mk \
diff -r 4e78b4a9e87c -r d56a56e41d43 src/dcmtk-2-ming64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dcmtk-2-ming64.patch	Mon Jun 30 20:04:58 2014 -0400
@@ -0,0 +1,32 @@
+Patch for the fact we are using the mingw-w64 with mingw32 compiler
+
+diff -ur 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	2014-06-30 12:23:34.314366353 -0400
++++ dcmtk-3.6.0/ofstd/include/dcmtk/ofstd/offile.h	2014-06-30 12:29:57.079959273 -0400
+@@ -81,7 +81,7 @@
+   typedef __int64 offile_off_t;
+   typedef fpos_t offile_fpos_t;
+ #else
+-  #ifdef EXPLICIT_LFS_64
++  #if defined(EXPLICIT_LFS_64) && !defined(__MINGW64__) && !defined(__MINGW32__)
+     // Explicit LFS (LFS64)
+     typedef fpos64_t offile_fpos_t;
+     typedef off64_t offile_off_t;
+@@ -196,7 +196,7 @@
+   OFBool popen(const char *command, const char *modes)
+   {
+     if (file_) fclose();
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+     file_ = _popen(command, modes);
+ #else
+     file_ = :: popen(command, modes);
+@@ -258,7 +258,7 @@
+     {
+       if (popened_)
+       {
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(__MINGW64__) && !defined(__MINGW32__)
+         result = _pclose(file_);
+ #else
+         result = :: pclose(file_);