From: Rudolf Polzer Date: Thu, 8 Jul 2021 12:09:01 +0000 (-0700) Subject: Rename host_t -> host_static_t. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54c8d13c76444ca7e9d3f65229b5638cc67c3db5;p=xonotic%2Fdarkplaces.git Rename host_t -> host_static_t. Fixes build on OS X, as host_t is already a typedef for mach_port_t. --- diff --git a/host.c b/host.c index efcba3e2..e196fe79 100644 --- a/host.c +++ b/host.c @@ -38,7 +38,7 @@ Memory is cleared / released when a server or client begins, not when they end. */ -host_t host; +host_static_t host; // pretend frames take this amount of time (in seconds), 0 = realtime cvar_t host_framerate = {CF_CLIENT | CF_SERVER, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; @@ -683,7 +683,7 @@ static inline void Host_Sleep(double time) else Sys_Sleep((int)time); delta = Sys_DirtyTime() - time0; - if (delta < 0 || delta >= 1800) + if (delta < 0 || delta >= 1800) delta = 0; host.sleeptime += delta; // R_TimeReport("sleep"); diff --git a/host.h b/host.h index 1d553c25..4521f72b 100644 --- a/host.h +++ b/host.h @@ -16,7 +16,7 @@ typedef enum host_state_e host_active } host_state_t; -typedef struct host_s +typedef struct host_static_s { jmp_buf abortframe; int state; @@ -38,9 +38,9 @@ typedef struct host_s void (*SV_SendCvar)(struct cmd_state_s *); void (*SV_Shutdown)(void); } hook; -} host_t; +} host_static_t; -extern host_t host; +extern host_static_t host; void Host_Main(void); void Host_Shutdown(void);