diff options
| author | Tim Angus <tim@ngus.net> | 2013-03-27 19:00:50 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-03-27 19:00:50 +0000 |
| commit | 38daed324464666b5a4bb6a758c60e960b4610f0 (patch) | |
| tree | e85a8d868ccc91833955be39bf35ca65485fb262 /src/game | |
| parent | f68ed0529955386976608b235b26f0abe8fc87c4 (diff) | |
Fix some warnings caused by lack of noreturn
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_local.h | 4 | ||||
| -rw-r--r-- | src/game/g_syscalls.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/game/g_local.h b/src/game/g_local.h index 2516e514..8e7aab8a 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -1001,7 +1001,7 @@ void G_AdminMessage( gentity_t *ent, const char *string ); void QDECL G_LogPrintf( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); void SendScoreboardMessageToAllClients( void ); void QDECL G_Printf( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); -void QDECL G_Error( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); +void QDECL G_Error( const char *fmt, ... ) __attribute__ ((noreturn, format (printf, 1, 2))); void G_Vote( gentity_t *ent, team_t team, qboolean voting ); void G_ExecuteVote( team_t team ); void G_CheckVote( team_t team ); @@ -1180,7 +1180,7 @@ extern vmCvar_t g_allowTeamOverlay; extern vmCvar_t g_censorship; void trap_Print( const char *fmt ); -void trap_Error( const char *fmt ); +void trap_Error( const char *fmt ) __attribute__((noreturn)); int trap_Milliseconds( void ); int trap_RealTime( qtime_t *qtime ); int trap_Argc( void ); diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c index ea13ac2e..37236b95 100644 --- a/src/game/g_syscalls.c +++ b/src/game/g_syscalls.c @@ -49,6 +49,8 @@ void trap_Print( const char *fmt ) void trap_Error( const char *fmt ) { syscall( G_ERROR, fmt ); + // shut up GCC warning about returning functions, because we know better + exit(1); } int trap_Milliseconds( void ) |