From: rouet Date: Sun, 12 Dec 2004 13:32:23 +0000 (+0000) Subject: * FIX: modified DirList::Explore in order to make it work under X-Git-Tag: Version1.0.bp~505 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c843abe4560b393a1eae2059f75ad1e752a22eda;p=gdcm.git * FIX: modified DirList::Explore in order to make it work under Cygwin when GDCM_DATA_ROOT is a defined by CMake as a unix path. The patch consists in not using the FindFirstFile win32api function under cygwin but rather the open dir *nix method. --- diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index ace87dc9..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/23 01:20:18 $ - Version: $Revision: 1.28 $ + 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,7 +22,7 @@ #include #include -#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__BORLANDC__) #include #ifdef _MSC_VER #include @@ -90,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;