X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=ca5c5fa1fc38b1ffae0ff13dfb870f56d4e5e087;hb=786ec05267c2b2892666e1a2ee3ca8a5d2c877a1;hp=0420c80aae4ac0b04a4108fe0c62c08c4f08e0ee;hpb=05f4ffeadc3beb5ff48fd88e7342d9287c18a27b;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 0420c80a..ca5c5fa1 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/09 21:55:55 $ - Version: $Revision: 1.26 $ + Date: $Date: 2004/12/12 13:32:23 $ + 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 @@ -22,9 +22,9 @@ #include #include -#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) #include -#if defined _MSC_VER || defined(__BORLANDC__) +#ifdef _MSC_VER #include #endif //_MSC_VER #else @@ -80,10 +80,9 @@ std::string const & DirList::GetDirName() const // Private /** - * \ingroup DirList * \brief Explore a directory with possibility of recursion * return number of files read - * @param dirName directory to explore + * @param dirpath directory to explore * @param recursive whether we want recursion or not */ int DirList::Explore(std::string const & dirpath, bool recursive) @@ -91,7 +90,7 @@ 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;