ENH: Fix a shadow variable

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 46c3bc299485b32d956af6106e48f7f4da6ab8e0..89e76f67d5c7f9b869784e966bc9326bf1accbda 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -1,5 +1,21 @@
-//gdcmCommon.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmCommon.h,v $
+  Language:  C++
+  Date:      $Date: 2004/07/19 11:51:26 $
+  Version:   $Revision: 1.29 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMCOMMON_H
 #define GDCMCOMMON_H
 
@@ -31,25 +47,19 @@
 //-----------------------------------------------------------------------------
 #ifdef __GNUC__
 #ifndef HAVE_NO_STDINT_H
-#include <stdint.h>
-#define guint16 uint16_t
-#define guint32 uint32_t
-#define gint16  int16_t
-#define gint32  int32_t
+#include <stdint.h>   // For uint8_t uint16_t and uint32_t
 #else
-typedef  unsigned short guint16;
-typedef  unsigned int   guint32;
-typedef  short          gint16;
-typedef  int                   gint32;
+typedef  unsigned char  uint8_t;
+typedef  unsigned short uint16_t;
+typedef  unsigned int   uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif //HAVE_NO_STDINT_H
 #endif
 
 #ifdef _MSC_VER 
-typedef  unsigned short guint16;
-typedef  unsigned int   guint32;
-typedef  short                 gint16;
-typedef  int            gint32;
+typedef  unsigned char  uint8_t;
+typedef  unsigned short uint16_t;
+typedef  unsigned int   uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif
 
@@ -83,7 +93,7 @@ typedef  int            gint32;
 
 const std::string GDCM_UNFOUND = "gdcm::Unfound";   /// MEMORY LEAK
 
-typedef std::string TagKey;
+typedef std::string gdcmTagKey;
 typedef std::string TagName;
 
 enum FileType {