From: malaterre Date: Sat, 2 Jul 2005 15:54:17 +0000 (+0000) Subject: ENH: Adding support for BCB6, big thanks to Luca Picello for patch X-Git-Tag: Version1.2.bp~388 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=156cc35489affb730a6aa95409e46e3610977086;p=gdcm.git ENH: Adding support for BCB6, big thanks to Luca Picello for patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fb8b8d9..ec8a27d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,8 +124,8 @@ INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) TEST_BIG_ENDIAN(GDCM_WORDS_BIGENDIAN) INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) +CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H) IF(UNIX) #Avoid polluting Win32 cmakecache - CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H) CHECK_INCLUDE_FILE("inttypes.h" CMAKE_HAVE_INTTYPES_H) ENDIF(UNIX) diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 4a2e2c0e..48098b9c 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/06/25 13:57:29 $ - Version: $Revision: 1.66 $ + Date: $Date: 2005/07/02 15:54:18 $ + Version: $Revision: 1.67 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,7 +57,8 @@ #endif // Broken plateform do not respect C99 and do not provide those typedef -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) +// Special case for recent borland compiler, comes with stdint.h +#if defined(_MSC_VER) || __BORLANDC__ < 0x0560 || defined(__MINGW32__) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t;