Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use int instead of SOCKET to avoid including winsock.h from wx/gsocket.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-23 12:18:08 +00:00
parent a2851207a6
commit ff55f8377b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/gsocket.h
View File

@@ -173,11 +173,10 @@ public:
virtual void Close() = 0; virtual void Close() = 0;
virtual void Shutdown(); virtual void Shutdown();
#ifdef __WINDOWS__ // this is officially SOCKET (unsigned int) under Windows but we don't want
SOCKET m_fd; // to include winsock.h which defines SOCKET from here so just use int
#else // under all platforms
int m_fd; int m_fd;
#endif
int m_initialRecvBufferSize; int m_initialRecvBufferSize;
int m_initialSendBufferSize; int m_initialSendBufferSize;

2
src/msw/gsockmsw.cpp
View File

@@ -367,7 +367,7 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
* destroyed) and for safety, check that the m_fd field * destroyed) and for safety, check that the m_fd field
* is what we expect it to be. * 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) switch WSAGETSELECTEVENT(lParam)
{ {