Had to #ifdef out all the new wxGetFullHostName code as it breaks all
the samples and apps _at least_ under mingw (and I think it will also cause other problems). Sorry, will have to wait for 2.1.14 to be released before this can be properly fixed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2d027cfa88
commit
90cfeaab3f
@ -178,6 +178,9 @@ bool wxGetHostName(wxChar *buf, int maxSize)
|
||||
// get full hostname (with domain name if possible)
|
||||
bool wxGetFullHostName(wxChar *buf, int maxSize)
|
||||
{
|
||||
// This breaks _at least_ mingw!!
|
||||
#if 0
|
||||
|
||||
#if defined(__WIN32__) && !defined(__TWIN32__)
|
||||
// TODO should use GetComputerNameEx() when available
|
||||
WSADATA wsa;
|
||||
@ -217,6 +220,8 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
|
||||
}
|
||||
#endif // Win32
|
||||
|
||||
#endif // 0
|
||||
|
||||
return wxGetHostName(buf, maxSize);
|
||||
}
|
||||
|
||||
@ -584,7 +589,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
|
||||
*majorVsn = info.dwMajorVersion;
|
||||
if (minorVsn)
|
||||
*minorVsn = info.dwMinorVersion;
|
||||
|
||||
|
||||
switch ( info.dwPlatformId )
|
||||
{
|
||||
case VER_PLATFORM_WIN32s:
|
||||
|
Loading…
Reference in New Issue
Block a user