]> Creatis software - gdcm.git/commitdiff
COMP: Apparently BCC6 did not like our heuristic, include some windows file also...
authormalaterre <malaterre>
Sat, 4 Jun 2005 01:24:15 +0000 (01:24 +0000)
committermalaterre <malaterre>
Sat, 4 Jun 2005 01:24:15 +0000 (01:24 +0000)
src/gdcmUtil.cxx

index 6ddba792fd5bcda525715a689687fa3d3d9bb7ff..a79d05650fc81cb90b8c2bc75396f1aea092771f 100644 (file)
@@ -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
 #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