AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added extern "C" around winsock and moved it before "wx/msw/private.h"

Browse Source 
to make it work with mingw (2.95 is buggy)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia 2000-03-20 13:00:27 +00:00
parent 062a3faae7
commit 26993c4f64
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/utils.cpp
View File

@ -36,6 +36,17 @@
#include "wx/log.h"
#endif //WX_PRECOMP
// In some mingws there is a missing extern "C" int the winsock header,
// so we put it here just to be safe. Note that this must appear _before_
// #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__)
extern "C" {
#include <winsock.h> // we use socket functions in wxGetFullHostName()
}
#endif
#include "wx/msw/private.h" // includes <windows.h>
#include "wx/timer.h"
@ -61,10 +72,6 @@
#include <dir.h>
#endif
#if defined(__WIN32__) && !defined(__TWIN32__)
#include <winsock.h> // we use socket functions in wxGetFullHostName()
#endif
// VZ: there is some code using NetXXX() functions to get the full user name:
// I don't think it's a good idea because they don't work under Win95 and
// seem to return the same as wxGetUserId() under NT. If you really want
@ -178,9 +185,6 @@ 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;
@ -220,8 +224,6 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
}
#endif // Win32
#endif // 0
return wxGetHostName(buf, maxSize);
}