yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #993 from devnexen/clang16_attr_fnptr

Browse source 
fix clang 16 build as C11 _NoReturn/noreturn attributes conflict.
This commit is contained in:
Yamagi 2023-04-16 11:24:16 +02:00 committed by GitHub
commit f67b65c00a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/sound/ogg.c
View file

@ -518,14 +518,12 @@ static void
OGG_Info(void)
{
Com_Printf("Tracks:\n");
int numFiles = 0;
for (int i = 2; i <= ogg_maxfileindex; i++)
{
if(ogg_tracks[i])
{
Com_Printf(" - %02d %s\n", i, ogg_tracks[i]);
++numFiles;
}
else
{

2
src/common/header/common.h
View file

@ -745,7 +745,7 @@ void Com_Printf(char *fmt, ...) PRINTF_ATTR(1, 2);
void Com_DPrintf(char *fmt, ...) PRINTF_ATTR(1, 2);
void Com_VPrintf(int print_level, const char *fmt, va_list argptr); /* print_level is PRINT_ALL or PRINT_DEVELOPER */
void Com_MDPrintf(char *fmt, ...) PRINTF_ATTR(1, 2);
YQ2_ATTR_NORETURN void Com_Error(int code, char *fmt, ...) PRINTF_ATTR(2, 3);
YQ2_ATTR_NORETURN_FUNCPTR void Com_Error(int code, char *fmt, ...) PRINTF_ATTR(2, 3);
YQ2_ATTR_NORETURN void Com_Quit(void);
/* Ugly work around for unsupported

5
src/server/sv_entities.c
View file

@ -513,7 +513,6 @@ SV_BuildClientFrame(client_t *client)
int l;
int clientarea, clientcluster;
int leafnum;
int c_fullsend;
byte *clientphs;
byte *bitvector;
@ -553,8 +552,6 @@ SV_BuildClientFrame(client_t *client)
frame->num_entities = 0;
frame->first_entity = svs.next_client_entities;
c_fullsend = 0;
for (e = 1; e < ge->num_edicts; e++)
{
ent = EDICT_NUM(e);
@ -608,8 +605,6 @@ SV_BuildClientFrame(client_t *client)
{
continue;
}
c_fullsend++;
}
else
{

2
src/server/sv_game.c
View file

@ -149,7 +149,7 @@ PF_centerprintf(edict_t *ent, char *fmt, ...)
/*
* Abort the server with a game error
*/
YQ2_ATTR_NORETURN void
YQ2_ATTR_NORETURN_FUNCPTR void
PF_error(char *fmt, ...)
{
char msg[1024];