ENH: Minor tweaks

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 771a9e29fa40ed0f6f532a4ff7ac0f9514a428d1..627cc6f1001da6633b185fd96ce44ed965fb641a 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: 2004/11/30 16:24:31 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2004/11/30 17:04:01 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -58,13 +58,8 @@
 
 #ifdef GDCM_HAVE_STDINT_H
 #include <stdint.h>   // For uint8_t uint16_t and uint32_t
-#endif
-
-namespace gdcm
-{
-
-#ifndef GDCM_HAVE_STDINT_H
-typedef    signed char   int8_t;
+#else
+//typedef    signed char   int8_t;
 typedef  unsigned char  uint8_t;
 typedef  unsigned short uint16_t;
 typedef  unsigned int   uint32_t;
@@ -77,10 +72,8 @@ typedef  unsigned int   uint32_t;
 #define GDCM_EXPORT
 #endif
 
-#ifdef _MSC_VER
-#define getcwd _getcwd
-#endif
-
+namespace gdcm
+{
 
 // Centralize information about the gdcm dictionary in only one file:
 #ifndef PUB_DICT_PATH

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index a3681e01a79d267ef26f23e23463631b2a3e7825..ee3b95c18920c33bb0bf28ac6234044a2d54ea3c 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/25 15:46:10 $
-  Version:   $Revision: 1.82 $
+  Date:      $Date: 2004/11/30 17:04:01 $
+  Version:   $Revision: 1.83 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,11 +34,16 @@
 #include <algorithm>
 #include <sys/types.h>
 
+#ifdef _MSC_VER
+#define getcwd _getcwd
+#endif
+
 #if defined( _MSC_VER) || defined(__BORLANDC__)
    #include <direct.h>
 #else
    #include <unistd.h>
 #endif
+
 namespace gdcm 
 {