Begin of 'friend' classe hunting.

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 03cd640eedb86c92ae1022d102b37aa4e91860f3..39d0ba7bdd4fe3f58db869a123ceb3458537dee7 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/18 15:46:49 $
-  Version:   $Revision: 1.111 $
+  Date:      $Date: 2005/01/21 11:40:56 $
+  Version:   $Revision: 1.113 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
 #include <stdarg.h>  //only included in implementation file
 #include <stdio.h>   //only included in implementation file
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__MINGW32__)
    #include <winsock.h>  // for gethostname & gethostbyname
    #undef GetCurrentTime
 #else
@@ -669,8 +669,8 @@ std::string Util::GetIPAddress()
 #  define HOST_NAME_MAX 255
    // In this case we should maybe check the string was not truncated.
    // But I don't known how to check that...
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-   // with WinSock DLL we need to initialise the WinSock before using gethostname
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
+   // with WinSock DLL we need to initialize the WinSock before using gethostname
    WORD wVersionRequested = MAKEWORD(1,0);
    WSADATA WSAData;
    int err = WSAStartup(wVersionRequested,&WSAData);
@@ -705,7 +705,7 @@ std::string Util::GetIPAddress()
          }
          // str now contains one local IP address 
  
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__)
    WSACleanup();
 #endif