X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=233a3d116887ec3c1faf5ec3de1efd2858545436;hb=7e9537ac534af5c5b9c5231c1b7fdd7193c2255d;hp=6f7b60054329a79e5d460af5476a3035efc21c3a;hpb=5919c78e996a255bea8a66da67165df8b753e582;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 6f7b6005..233a3d11 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/01/10 18:09:07 $ - Version: $Revision: 1.47 $ + Date: $Date: 2005/01/15 20:24:02 $ + Version: $Revision: 1.50 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,7 @@ #endif //_MSC_VER //----------------------------------------------------------------------------- -#ifdef GDCM_HAVE_STDINT_H +#ifdef CMAKE_HAVE_STDINT_H #include // For uint8_t uint16_t and uint32_t #else #if defined(_MSC_VER) || defined(__BORLANDC__) @@ -57,10 +57,14 @@ typedef unsigned int uint32_t; #define UINT32_MAX (4294967295U) #endif -#if defined(_MSC_VER) || defined(__BORLANDC__) -#define GDCM_EXPORT __declspec( dllexport ) +#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 + #define GDCM_EXPORT #endif #include