X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=c363f7b8e90f32bed7755173e1174b1733f498db;hb=51cbcb8520d5fcb26ea0ceec99f58b8db9692876;hp=938dbb3fb948af4b9e65da419ad48bc8110a64c9;hpb=c03bc9b5e7d49126a10d49f78682410a5500c412;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 938dbb3f..c363f7b8 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/16 10:25:53 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/01/06 20:03:27 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,9 +22,9 @@
 #include <iostream>
 #include <algorithm>
 
-#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
    #include <windows.h> 
-#if defined _MSC_VER || defined(__BORLANDC__)
+#ifdef _MSC_VER
    #include <direct.h>
 #endif //_MSC_VER
 #else
@@ -43,7 +43,7 @@ namespace gdcm
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
  */
-DirList::DirList(std::string const & dirName, bool recursive)
+DirList::DirList(std::string const &dirName, bool recursive)
 {
    name = dirName;
    Util::NormalizePath(name);
@@ -68,7 +68,7 @@ DirList::~DirList()
  * \brief   Get the directory name
  * @return the directory name 
  */
-std::string const & DirList::GetDirName() const
+std::string const &DirList::GetDirName() const
 {
    return name;
 }
@@ -85,12 +85,12 @@ std::string const & DirList::GetDirName() const
  * @param  dirpath   directory to explore
  * @param  recursive whether we want recursion or not
  */
-int DirList::Explore(std::string const & dirpath, bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive)
 {
    int numberOfFiles = 0;
    std::string fileName;
    std::string dirName = Util::NormalizePath(dirpath);
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;
@@ -112,7 +112,7 @@ int DirList::Explore(std::string const & dirpath, bool recursive)
          numberOfFiles++;
       }
 
-      found = FindNextFile(hFile,&fileData);
+      found = FindNextFile(hFile, &fileData);
    }
 
 #else
@@ -131,7 +131,7 @@ int DirList::Explore(std::string const & dirpath, bool recursive)
    // bility  of  your  programs.
 
    struct stat buf;
-   dirent* d = 0;
+   dirent *d = 0;
    for (d = readdir(dir); d; d = readdir(dir))
    {
       fileName = dirName + d->d_name;