Mercurial > mxe-octave
view src/dcmtk-2-ming64.patch @ 4618:de2eedecd6ba
update broken PKG_UPDATE rules, handle missing update rules
* Makefile.in: add handling for packages with no update rule
* src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk,
src/hunspell.mk, src/vala.mk : use github tags for version info
* src/llvm.mk: add '?' to update url
* src/openscenegraph.mk: update SED rule for version extraction
* src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk,
src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule
* src/qscintilla.mk: change search name for version extraction
* src/qtbase.mk: use short pkg version in update path
* src/suitesparse.mk: update change in main url/version url
* src/tre.mk: update download page link
* src/vmime.mk: update download and update url
* src/wget.mk, src/xapian-core.mk: update url, sed rule
* src/wt.mk: update to use github download/update
* src/src-msys-libcrypt.mk: update sed rule
author | John Donoghue |
---|---|
date | Fri, 09 Mar 2018 11:46:42 -0500 |
parents | d56a56e41d43 |
children |
line wrap: on
line source
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_);