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

Changed declaration of functions taking an empty arglist (which means

Browse Source 
no prototype in C, not (void) like in C++) to take (void) instead.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-14 09:32:27 +00:00
parent 09707570eb
commit da051b23fe
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gsocket.h
View File

@@ -91,15 +91,15 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
/* Global initializers */ /* Global initializers */
/* GSocket_Init() must be called at the beginning */ /* GSocket_Init() must be called at the beginning */
bool GSocket_Init(); bool GSocket_Init(void);
/* GSocket_Cleanup() must be called at the end */ /* GSocket_Cleanup() must be called at the end */
void GSocket_Cleanup(); void GSocket_Cleanup(void);
/* Constructors / Destructors */ /* Constructors / Destructors */
GSocket *GSocket_new(); GSocket *GSocket_new(void);
void GSocket_destroy(GSocket *socket); void GSocket_destroy(GSocket *socket);
@@ -289,7 +289,7 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
/* GAddress */ /* GAddress */
GAddress *GAddress_new(); GAddress *GAddress_new(void);
GAddress *GAddress_copy(GAddress *address); GAddress *GAddress_copy(GAddress *address);
void GAddress_destroy(GAddress *address); void GAddress_destroy(GAddress *address);

9
src/msw/gsocket.c
View File

@@ -42,11 +42,6 @@
#define SOCKLEN_T int #define SOCKLEN_T int
#endif #endif
#if defined(__BORLANDC__)
GAddress *GAddress_new(void);
GSocket *GSocket_new(void);
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
/* using FD_SET results in this warning */ /* using FD_SET results in this warning */
#pragma warning(disable:4127) /* conditional expression is constant */ #pragma warning(disable:4127) /* conditional expression is constant */
@@ -55,7 +50,7 @@ GSocket *GSocket_new(void);
/* Constructors / Destructors for GSocket */ /* Constructors / Destructors for GSocket */
GSocket *GSocket_new() GSocket *GSocket_new(void)
{ {
int i; int i;
GSocket *socket; GSocket *socket;
@@ -953,7 +948,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
} \ } \
} }
GAddress *GAddress_new() GAddress *GAddress_new(void)
{ {
GAddress *address; GAddress *address;

22
src/unix/gsocket.c
View File

@@ -113,18 +113,18 @@ struct sockaddr_un {
/* Global initialisers */ /* Global initialisers */
bool GSocket_Init() bool GSocket_Init(void)
{ {
return TRUE; return TRUE;
} }
void GSocket_Cleanup() void GSocket_Cleanup(void)
{ {
} }
/* Constructors / Destructors for GSocket */ /* Constructors / Destructors for GSocket */
GSocket *GSocket_new() GSocket *GSocket_new(void)
{ {
int i; int i;
GSocket *socket; GSocket *socket;
@@ -151,8 +151,12 @@ GSocket *GSocket_new()
/* 10 minutes * 60 sec * 1000 millisec */ /* 10 minutes * 60 sec * 1000 millisec */
socket->m_establishing = FALSE; socket->m_establishing = FALSE;
/* We initialize the GUI specific entries here */ /* Per-socket GUI-specific initialization */
_GSocket_GUI_Init(socket); if (!_GSocket_GUI_Init(socket))
{
free(socket);
return NULL;
}
return socket; return socket;
} }
@@ -161,13 +165,13 @@ void GSocket_destroy(GSocket *socket)
{ {
assert(socket != NULL); assert(socket != NULL);
/* Per-socket GUI-specific cleanup */
_GSocket_GUI_Destroy(socket);
/* Check that the socket is really shutdowned */ /* Check that the socket is really shutdowned */
if (socket->m_fd != -1) if (socket->m_fd != -1)
GSocket_Shutdown(socket); GSocket_Shutdown(socket);
/* We destroy GUI specific variables */
_GSocket_GUI_Destroy(socket);
/* Destroy private addresses */ /* Destroy private addresses */
if (socket->m_local) if (socket->m_local)
GAddress_destroy(socket->m_local); GAddress_destroy(socket->m_local);
@@ -1115,7 +1119,7 @@ void _GSocket_Detected_Write(GSocket *socket)
} \ } \
} }
GAddress *GAddress_new() GAddress *GAddress_new(void)
{ {
GAddress *address; GAddress *address;