don't include winsock.h directly, this doesn't work (patch 565655)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d86ab8e29f
commit
f5e2134e5b
@ -38,17 +38,6 @@
|
||||
#endif
|
||||
#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__) && !defined(__WXMICROWIN__) && ! (defined(__GNUWIN32__) && !defined(__MINGW32__))
|
||||
extern "C" {
|
||||
#include <winsock.h> // we use socket functions in wxGetFullHostName()
|
||||
}
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h" // includes <windows.h>
|
||||
|
||||
#include "wx/timer.h"
|
||||
|
Loading…
Reference in New Issue
Block a user