From f2f8346cbd0d29520da693ebce9e54df0f7dcbc7 Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 7 Jul 2005 17:55:08 +0000 Subject: [PATCH] ENH: Fix compilation on mingw32, also minor cleanup gdcm compilation will fail right away on new unsupported plateform instead of doing cryptic messages --- src/gdcmCommon.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index be09ff3c..dfcbddf7 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/07/02 19:19:57 $ - Version: $Revision: 1.68 $ + Date: $Date: 2005/07/07 17:55:08 $ + Version: $Revision: 1.69 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -53,9 +53,7 @@ #ifdef CMAKE_HAVE_INTTYPES_H // Old system only have this #include // For uint8_t uint16_t and uint32_t -#endif -#endif - +#else // Broken plateform do not respect C99 and do not provide those typedef // Special case for recent borland compiler, comes with stdint.h #if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) @@ -65,6 +63,14 @@ typedef signed int int32_t; typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; +#else +#error "Sorry your plateform is not supported" +#endif // defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560) || defined(__MINGW32__) +#endif // CMAKE_HAVE_INTTYPES_H +#endif // CMAKE_HAVE_STDINT_H + +// Basically for VS6 and bcc 5.5.1: +#ifndef UINT32_MAX #define UINT32_MAX (4294967295U) #endif -- 2.48.1