From: malaterre <malaterre>
Date: Wed, 12 Jan 2005 21:24:17 +0000 (+0000)
Subject: BUG: makeDicomDir was not working on Borland
X-Git-Tag: Version1.0.bp~364
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f51aad1e7d2d77fd971d863ad31829bafef84055;p=gdcm.git

BUG: makeDicomDir was not working on Borland
---

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index c363f7b8..b7098a06 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2005/01/12 21:24:17 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,18 +20,14 @@
 #include "gdcmUtil.h"
 
 #include <iostream>
-#include <algorithm>
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-   #include <windows.h> 
 #ifdef _MSC_VER
+   #include <windows.h> 
    #include <direct.h>
-#endif //_MSC_VER
 #else
    #include <dirent.h>   
-   #include <unistd.h>
-   #include <sys/stat.h>
    #include <sys/types.h>
+   #include <sys/stat.h>
 #endif
 
 namespace gdcm 
@@ -90,7 +86,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(__BORLANDC__)
+#ifdef _MSC_VER
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
    int found = true;