From: malaterre <malaterre>
Date: Sat, 4 Jun 2005 01:24:15 +0000 (+0000)
Subject: COMP: Apparently BCC6 did not like our heuristic, include some windows file also... 
X-Git-Tag: Version1.2.bp~622
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=98e00835b966639d7ad1c8e55a74f9c2c398ac7a;p=gdcm.git

COMP: Apparently BCC6 did not like our heuristic, include some windows file also to please borland. Thanks to Luca Picello for report
---

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 6ddba792..a79d0565 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/11 14:40:57 $
-  Version:   $Revision: 1.149 $
+  Date:      $Date: 2005/06/04 01:24:15 $
+  Version:   $Revision: 1.150 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,15 +34,15 @@
 #include <stdarg.h>  //only included in implementation file
 #include <stdio.h>   //only included in implementation file
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
-   #include <winsock.h>  // for gethostname and gethostbyname
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
+   #include <winsock.h>  // for gethostname and gethostbyname and GetTickCount...
+#ifdef GetCurrentTime
    #undef GetCurrentTime
+#endif
 #else
-#ifndef __BORLANDC__
    #include <unistd.h>  // for gethostname
    #include <netdb.h>   // for gethostbyname
 #endif
-#endif
 
 // For GetMACAddress
 #ifdef _WIN32