From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 20 Mar 2000 16:52:43 +0000 (+0000)
Subject: Had to #ifdef out wxGetFullHostName for Cygwin b20
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f8f3e76318861e3f6b5d164e9d0147995f352917

Had to #ifdef out wxGetFullHostName for Cygwin b20


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index b6bb6443b0..f836d8dc4b 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -41,7 +41,7 @@
 // #include "wx/msw/private.h" which itself includes <windows.h>, as this 
 // one in turn includes <winsock.h> unless we define WIN32_LEAN_AND_MEAN.
 //
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
 extern "C" {
     #include <winsock.h>    // we use socket functions in wxGetFullHostName()
 }
@@ -185,7 +185,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__TWIN32__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
     // TODO should use GetComputerNameEx() when available
     WSADATA wsa;
     if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )