teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Shut up returning functions with noreturn attribute warning

This commit is contained in:
Thilo Schulz 2011-07-18 22:02:16 +00:00
parent b248479376
commit dd859ae43d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/cgame/cg_local.h
View File

@ -1193,7 +1193,7 @@ const char *CG_ConfigString( int index );
const char *CG_Argv( int arg );
void QDECL CG_Printf( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
void QDECL CG_Error( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
void QDECL CG_Error( const char *msg, ... ) __attribute__ ((noreturn, format (printf, 1, 2)));
void CG_StartMusic( void );
@ -1475,7 +1475,7 @@ void CG_CheckChangedPredictableEvents( playerState_t *ps );
void trap_Print( const char *fmt );
// abort the game
void trap_Error( const char *fmt );
void trap_Error(const char *fmt) __attribute__((noreturn));
// milliseconds should only be used for performance tuning, never
// for anything game related. Get time from the CG_DrawActiveFrame parameter

7
code/cgame/cg_syscalls.c
View File

@ -46,8 +46,11 @@ void trap_Print( const char *fmt ) {
syscall( CG_PRINT, fmt );
}
void trap_Error( const char *fmt ) {
syscall( CG_ERROR, fmt );
void trap_Error(const char *fmt)
{
syscall(CG_ERROR, fmt);
// shut up GCC warning about returning functions, because we know better
exit(1);
}
int trap_Milliseconds( void ) {