diff --git a/engine/client/client.h b/engine/client/client.h index cc6683df..fc4f9a9c 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -702,7 +702,7 @@ dlight_t *CL_GetEntityLight( int number ); // // cl_cmds.c // -void CL_Quit_f( void ) NORETURN; +void CL_Quit_f( void ); void CL_ScreenShot_f( void ); void CL_SnapShot_f( void ); void CL_PlayCDTrack_f( void ); diff --git a/engine/common/common.h b/engine/common/common.h index 58741bf3..b954dbd3 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -569,7 +569,7 @@ void Host_WriteConfig( void ); qboolean Host_IsLocalGame( void ); qboolean Host_IsLocalClient( void ); void Host_ShutdownServer( void ); -void Host_Error( const char *error, ... ) _format( 1 ) NORETURN; +void Host_Error( const char *error, ... ) _format( 1 ); void Host_PrintEngineFeatures( void ); void Host_Frame( float time ); void Host_InitDecals( void ); diff --git a/engine/common/system.h b/engine/common/system.h index 6a186602..c6d8956d 100644 --- a/engine/common/system.h +++ b/engine/common/system.h @@ -51,7 +51,7 @@ char *Sys_GetClipboardData( void ); const char *Sys_GetCurrentUser( void ); int Sys_CheckParm( const char *parm ); void Sys_Warn( const char *format, ... ) _format( 1 ); -void Sys_Error( const char *error, ... ) _format( 1 ) NORETURN; +void Sys_Error( const char *error, ... ) _format( 1 ); qboolean Sys_LoadLibrary( dll_info_t *dll ); void* Sys_GetProcAddress( dll_info_t *dll, const char* name ); qboolean Sys_FreeLibrary( dll_info_t *dll ); diff --git a/engine/menu_int.h b/engine/menu_int.h index 8a6905d6..d273d8f6 100644 --- a/engine/menu_int.h +++ b/engine/menu_int.h @@ -54,11 +54,6 @@ typedef struct ui_globalvars_s struct ref_viewpass_s; -#if __GNUC__ == 3 -#undef NORETURN -#define NORETURN -#endif // GCC 3.x have problems with noreturn attribute on function pointer - typedef struct ui_enginefuncs_s { // image handlers @@ -122,7 +117,7 @@ typedef struct ui_enginefuncs_s int (*CL_CreateVisibleEntity)( int type, struct cl_entity_s *ent ); // misc handlers - void (*pfnHostError)( const char *szFmt, ... ) _format( 1 ) NORETURN; + void (*pfnHostError)( const char *szFmt, ... ) _format( 1 ); int (*pfnFileExists)( const char *filename, int gamedironly ); void (*pfnGetGameDir)( char *szGetGameDir ); diff --git a/engine/ref_api.h b/engine/ref_api.h index 2f78b709..2b2e4ca1 100644 --- a/engine/ref_api.h +++ b/engine/ref_api.h @@ -339,7 +339,7 @@ typedef struct ref_api_s // utils void (*CL_ExtraUpdate)( void ); - void (*Host_Error)( const char *fmt, ... ) _format( 1 ) NORETURN; + void (*Host_Error)( const char *fmt, ... ) _format( 1 ); void (*COM_SetRandomSeed)( int lSeed ); float (*COM_RandomFloat)( float rmin, float rmax ); int (*COM_RandomLong)( int rmin, int rmax );