ENH: Be more verbose on Win32

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index d9dab0a8b8a2f5668d1aafa07acc64095434d6eb..233a3d116887ec3c1faf5ec3de1efd2858545436 100644 (file)
--- 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/08 23:14:05 $
-  Version:   $Revision: 1.45 $
+  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 <stdint.h>   // 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 <string>
@@ -78,11 +82,11 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-static const std::string GDCM_UNKNOWN   = "gdcm::Unknown";
-static const std::string GDCM_UNFOUND   = "gdcm::Unfound";
-static const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
-static const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
-static const std::string GDCM_UNREAD    = "gdcm::UnRead";
+GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
+GDCM_EXPORT extern const std::string GDCM_UNFOUND;
+GDCM_EXPORT extern const std::string GDCM_BINLOADED;
+GDCM_EXPORT extern const std::string GDCM_NOTLOADED;
+GDCM_EXPORT extern const std::string GDCM_UNREAD;
 
 /// \brief TagKey is made to hold an "universal" (as in URL, Universal
 ///        Ressource Locator)  key to a DocEntry i.e. a dicom tag.