fix
This commit is contained in:
parent
b1545f05b3
commit
25c10cd223
5 changed files with 11 additions and 11 deletions
|
|
@ -24,9 +24,6 @@ typedef unsigned char byte;
|
||||||
#define BYTE_DEFINED 1
|
#define BYTE_DEFINED 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef qtrue
|
|
||||||
#undef qfalse
|
|
||||||
|
|
||||||
typedef enum {qfalse, qtrue} qboolean;
|
typedef enum {qfalse, qtrue} qboolean;
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,7 @@ typedef struct _PollProcedure
|
||||||
{
|
{
|
||||||
struct _PollProcedure *next;
|
struct _PollProcedure *next;
|
||||||
double nextTime;
|
double nextTime;
|
||||||
void (*procedure)();
|
void (*procedure)(void* arg);
|
||||||
void *arg;
|
void *arg;
|
||||||
} PollProcedure;
|
} PollProcedure;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
|
#ifndef _WIN32
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(WINQUAKE)
|
#if defined(WINQUAKE)
|
||||||
#include "winquake.h"
|
#include "winquake.h"
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,8 @@ qboolean slistLocal = qtrue;
|
||||||
static double slistStartTime;
|
static double slistStartTime;
|
||||||
static int slistLastShown;
|
static int slistLastShown;
|
||||||
|
|
||||||
static void Slist_Send(void);
|
static void Slist_Send(void* arg);
|
||||||
static void Slist_Poll(void);
|
static void Slist_Poll(void* arg);
|
||||||
PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
|
PollProcedure slistSendProcedure = {NULL, 0.0, Slist_Send};
|
||||||
PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};
|
PollProcedure slistPollProcedure = {NULL, 0.0, Slist_Poll};
|
||||||
|
|
||||||
|
|
@ -312,7 +312,7 @@ void NET_Slist_f (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void Slist_Send(void)
|
static void Slist_Send(void* arg)
|
||||||
{
|
{
|
||||||
for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
||||||
{
|
{
|
||||||
|
|
@ -328,7 +328,7 @@ static void Slist_Send(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void Slist_Poll(void)
|
static void Slist_Poll(void* arg)
|
||||||
{
|
{
|
||||||
for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
for (net_driverlevel=0; net_driverlevel < net_numdrivers; net_driverlevel++)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ void Sys_Error (char *error, ...)
|
||||||
char string[1024];
|
char string[1024];
|
||||||
|
|
||||||
// change stdin to non blocking
|
// change stdin to non blocking
|
||||||
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
|
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
|
||||||
|
|
||||||
va_start (argptr,error);
|
va_start (argptr,error);
|
||||||
vsprintf (string,error,argptr);
|
vsprintf (string,error,argptr);
|
||||||
|
|
@ -386,7 +386,7 @@ int main (int c, char **v)
|
||||||
// caching is disabled by default, use -cachedir to enable
|
// caching is disabled by default, use -cachedir to enable
|
||||||
// parms.cachedir = cachedir;
|
// parms.cachedir = cachedir;
|
||||||
|
|
||||||
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
|
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
|
||||||
|
|
||||||
Host_Init(&parms);
|
Host_Init(&parms);
|
||||||
|
|
||||||
|
|
@ -395,7 +395,7 @@ int main (int c, char **v)
|
||||||
if (COM_CheckParm("-nostdout"))
|
if (COM_CheckParm("-nostdout"))
|
||||||
nostdout = 1;
|
nostdout = 1;
|
||||||
else {
|
else {
|
||||||
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
|
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
|
||||||
printf ("Milsko Quake -- Version %0.3f\n", LINUX_VERSION);
|
printf ("Milsko Quake -- Version %0.3f\n", LINUX_VERSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue