X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSystem.h;h=67a9769ca677befb101d78b2036a332c6fc4c49a;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=dabf98ee8f658793266855ed53574ebe9b97acda;hpb=4117dec671b980b51a16117a5692d822b63bbe04;p=gdcm.git diff --git a/src/gdcmSystem.h b/src/gdcmSystem.h index dabf98ee..67a9769c 100644 --- a/src/gdcmSystem.h +++ b/src/gdcmSystem.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSystem.h,v $ Language: C++ - Date: $Date: 2005/10/18 09:17:08 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/13 18:53:34 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,8 +16,8 @@ =========================================================================*/ -#ifndef GDCMSYSTEM_H -#define GDCMSYSTEM_H +#ifndef _GDCMSYSTEM_H_ +#define _GDCMSYSTEM_H_ #include "gdcmConfigure.h" @@ -61,6 +61,7 @@ typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; +/// \fixme : what about 64 bits ? typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -75,28 +76,5 @@ typedef unsigned int uint32_t; #define UINT32_MAX (4294967295U) #endif -#if defined(_WIN32) && defined(BUILD_SHARED_LIBS) - #ifdef gdcm_EXPORTS - #define GDCM_EXPORT __declspec( dllexport ) - #else - #define GDCM_EXPORT __declspec( dllimport ) - #endif -#else - #define GDCM_EXPORT -#endif - -#include -#define FASTTAGKEY 0 - -// FIXME: Should rewrite this: -#if FASTTAGKEY -#include -#include -#endif -#if defined(_MSC_VER) && (_MSC_VER == 1200) -/* ostream operator for std::string since VS6 does not provide it*/ -#include -#endif - //----------------------------------------------------------------------------- #endif