Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Had to #ifdef out wxGetFullHostName for Cygwin b20

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-20 16:52:43 +00:00
parent f47cd02d71
commit f8f3e76318
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/utils.cpp
View File

@@ -41,7 +41,7 @@
// #include "wx/msw/private.h" which itself includes <windows.h>, as this // #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. // 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" { extern "C" {
#include <winsock.h> // we use socket functions in wxGetFullHostName() #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) // get full hostname (with domain name if possible)
bool wxGetFullHostName(wxChar *buf, int maxSize) 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 // TODO should use GetComputerNameEx() when available
WSADATA wsa; WSADATA wsa;
if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 ) if ( WSAStartup(MAKEWORD(1, 1), &wsa) == 0 )