ensure that gsockmsw.obj is linked in, it was optimized away by MSVC linker resulting in socket manager not being initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,6 +58,9 @@
|
|||||||
#if wxUSE_SOCKETS
|
#if wxUSE_SOCKETS
|
||||||
|
|
||||||
#include "wx/gsocket.h"
|
#include "wx/gsocket.h"
|
||||||
|
#include "wx/link.h"
|
||||||
|
|
||||||
|
wxFORCE_LINK_MODULE(gsockmsw)
|
||||||
|
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
#ifndef isdigit
|
#ifndef isdigit
|
||||||
|
@@ -38,6 +38,9 @@
|
|||||||
|
|
||||||
#include "wx/gsocket.h"
|
#include "wx/gsocket.h"
|
||||||
#include "wx/apptrait.h"
|
#include "wx/apptrait.h"
|
||||||
|
#include "wx/link.h"
|
||||||
|
|
||||||
|
wxFORCE_LINK_THIS_MODULE(gsockmsw)
|
||||||
|
|
||||||
extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
|
extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
|
||||||
#define INSTANCE wxGetInstance()
|
#define INSTANCE wxGetInstance()
|
||||||
@@ -470,6 +473,6 @@ static struct ManagerSetter
|
|||||||
static GSocketMSWManager s_manager;
|
static GSocketMSWManager s_manager;
|
||||||
wxAppTraits::SetDefaultSocketManager(&s_manager);
|
wxAppTraits::SetDefaultSocketManager(&s_manager);
|
||||||
}
|
}
|
||||||
} gsm_managerSetter;
|
} gs_managerSetter;
|
||||||
|
|
||||||
#endif // wxUSE_SOCKETS
|
#endif // wxUSE_SOCKETS
|
||||||
|
Reference in New Issue
Block a user