use int instead of SOCKET to avoid including winsock.h from wx/gsocket.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -173,11 +173,10 @@ public:
|
||||
virtual void Close() = 0;
|
||||
virtual void Shutdown();
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
SOCKET m_fd;
|
||||
#else
|
||||
// this is officially SOCKET (unsigned int) under Windows but we don't want
|
||||
// to include winsock.h which defines SOCKET from here so just use int
|
||||
// under all platforms
|
||||
int m_fd;
|
||||
#endif
|
||||
|
||||
int m_initialRecvBufferSize;
|
||||
int m_initialSendBufferSize;
|
||||
|
@@ -367,7 +367,7 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
|
||||
* destroyed) and for safety, check that the m_fd field
|
||||
* is what we expect it to be.
|
||||
*/
|
||||
if ((socket != NULL) && (socket->m_fd == wParam))
|
||||
if ((socket != NULL) && ((WPARAM)socket->m_fd == wParam))
|
||||
{
|
||||
switch WSAGETSELECTEVENT(lParam)
|
||||
{
|
||||
|
Reference in New Issue
Block a user