From 57a1cb49792ff87dc5e5d16c211de6c4b793c185 Mon Sep 17 00:00:00 2001 From: Thomas Feuvrier <thomas.feuvrier@c-s.fr> Date: Mon, 22 Oct 2007 16:34:22 +0000 Subject: [PATCH] Correction du code : /* OTB Modification for MinGW generation -> report bug on the ITK mailing list */ /* #if defined(_WIN32) && !defined(__CYGWIN__) */ #if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) --- Utilities/ITK/Utilities/itkjpeg/jconfig.h.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Utilities/ITK/Utilities/itkjpeg/jconfig.h.in b/Utilities/ITK/Utilities/itkjpeg/jconfig.h.in index 6175bb4e9a..6f1a8786e5 100755 --- a/Utilities/ITK/Utilities/itkjpeg/jconfig.h.in +++ b/Utilities/ITK/Utilities/itkjpeg/jconfig.h.in @@ -21,7 +21,9 @@ #undef INCOMPLETE_TYPES_BROKEN -#if defined(_WIN32) && !defined(__CYGWIN__) +/* OTB Modification for MinGW generation -> report bug on the ITK mailing list */ +/* #if defined(_WIN32) && !defined(__CYGWIN__) */ +#if defined(_WIN32) && !(defined(__CYGWIN__) || defined(__MINGW32__)) /* Define "boolean" as unsigned char, not int, per Windows custom */ /* don't conflict if rpcndr.h already read; Note that the w32api headers used by Cygwin does not define "boolean", so jmorecfg.h -- GitLab