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

C/C++ differences

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-07-29 02:07:42 +00:00
parent f7ff39c6ac
commit 32524c8fb8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/gsocket.cpp
View File

@@ -3,7 +3,7 @@
* Name: gsocket.c * Name: gsocket.c
* Author: Guillermo Rodriguez Garcia <guille@iies.es> * Author: Guillermo Rodriguez Garcia <guille@iies.es>
* Purpose: GSocket main MSW file * Purpose: GSocket main MSW file
* Licence: The wxWidgets licence * Licence: The wxWindows licence
* CVSID: $Id$ * CVSID: $Id$
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
@@ -863,7 +863,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
socket->m_establishing = FALSE; socket->m_establishing = FALSE;
getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
if (error) if (error)
{ {
@@ -1010,7 +1010,7 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname, GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
void *optval, int *optlen) void *optval, int *optlen)
{ {
if (getsockopt(socket->m_fd, level, optname, optval, optlen) == 0) if (getsockopt(socket->m_fd, level, optname, (char*)optval, optlen) == 0)
{ {
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }
@@ -1020,7 +1020,7 @@ GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname,
const void *optval, int optlen) const void *optval, int optlen)
{ {
if (setsockopt(socket->m_fd, level, optname, optval, optlen) == 0) if (setsockopt(socket->m_fd, level, optname, (char*)optval, optlen) == 0)
{ {
return GSOCK_NOERROR; return GSOCK_NOERROR;
} }

4
src/msw/gsockmsw.cpp
View File

@@ -55,7 +55,7 @@
#include "wx/msw/gsockmsw.h" #include "wx/msw/gsockmsw.h"
#include "wx/gsocket.h" #include "wx/gsocket.h"
HINSTANCE wxGetInstance(void); extern "C" HINSTANCE wxGetInstance(void);
#define INSTANCE wxGetInstance() #define INSTANCE wxGetInstance()
#else #else
@@ -94,7 +94,7 @@ HINSTANCE wxGetInstance(void);
#define CLASSNAME TEXT("_GSocket_Internal_Window_Class") #define CLASSNAME TEXT("_GSocket_Internal_Window_Class")
/* implemented in utils.cpp */ /* implemented in utils.cpp */
extern WXDLLIMPEXP_BASE HWND extern "C" WXDLLIMPEXP_BASE HWND
wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
/* Maximum number of different GSocket objects at a given time. /* Maximum number of different GSocket objects at a given time.