mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
made the PollProcedure api compatible with C++.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@298 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
5c57699095
commit
d9182f61a4
3 changed files with 9 additions and 9 deletions
|
@ -251,7 +251,7 @@ typedef struct _PollProcedure
|
||||||
{
|
{
|
||||||
struct _PollProcedure *next;
|
struct _PollProcedure *next;
|
||||||
double nextTime;
|
double nextTime;
|
||||||
void (*procedure)();
|
void (*procedure)(void *);
|
||||||
void *arg;
|
void *arg;
|
||||||
} PollProcedure;
|
} PollProcedure;
|
||||||
|
|
||||||
|
|
|
@ -524,10 +524,10 @@ static int testPollCount;
|
||||||
static int testDriver;
|
static int testDriver;
|
||||||
static int testSocket;
|
static int testSocket;
|
||||||
|
|
||||||
static void Test_Poll (void);
|
static void Test_Poll (void *);
|
||||||
static PollProcedure testPollProcedure = {NULL, 0.0, Test_Poll};
|
static PollProcedure testPollProcedure = {NULL, 0.0, Test_Poll};
|
||||||
|
|
||||||
static void Test_Poll (void)
|
static void Test_Poll (void *unused)
|
||||||
{
|
{
|
||||||
struct qsockaddr clientaddr;
|
struct qsockaddr clientaddr;
|
||||||
int control;
|
int control;
|
||||||
|
@ -658,10 +658,10 @@ static qboolean test2InProgress = false;
|
||||||
static int test2Driver;
|
static int test2Driver;
|
||||||
static int test2Socket;
|
static int test2Socket;
|
||||||
|
|
||||||
static void Test2_Poll (void);
|
static void Test2_Poll (void *);
|
||||||
static PollProcedure test2PollProcedure = {NULL, 0.0, Test2_Poll};
|
static PollProcedure test2PollProcedure = {NULL, 0.0, Test2_Poll};
|
||||||
|
|
||||||
static void Test2_Poll (void)
|
static void Test2_Poll (void *unused)
|
||||||
{
|
{
|
||||||
struct qsockaddr clientaddr;
|
struct qsockaddr clientaddr;
|
||||||
int control;
|
int control;
|
||||||
|
|
|
@ -48,8 +48,8 @@ qboolean slistLocal = true;
|
||||||
static double slistStartTime;
|
static double slistStartTime;
|
||||||
static int slistLastShown;
|
static int slistLastShown;
|
||||||
|
|
||||||
static void Slist_Send (void);
|
static void Slist_Send (void *);
|
||||||
static void Slist_Poll (void);
|
static void Slist_Poll (void *);
|
||||||
static PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
|
static PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
|
||||||
static PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};
|
static PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};
|
||||||
|
|
||||||
|
@ -307,7 +307,7 @@ void NET_Slist_f (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void Slist_Send (void)
|
static void Slist_Send (void *unused)
|
||||||
{
|
{
|
||||||
for (net_driverlevel = 0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
for (net_driverlevel = 0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
||||||
{
|
{
|
||||||
|
@ -323,7 +323,7 @@ static void Slist_Send (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void Slist_Poll (void)
|
static void Slist_Poll (void *unused)
|
||||||
{
|
{
|
||||||
for (net_driverlevel = 0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
for (net_driverlevel = 0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue