nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

warning fix in msdos build

Browse Source 
../sys/msdos/font.c:24:12: warning: declaration of 'flags' shadows a global declaration [-Wshadow]
   24 |     uint32 flags;
      |            ^~~~~
In file included from ../include/hack.h:285,
                 from ../sys/msdos/font.c:3:
../include/flag.h:422:29: note: shadowed declaration is here
  422 | extern NEARDATA struct flag flags;
      |                             ^~~~~
make[2]: Entering directory '/home/nhmall/git/NHsource/util'
This commit is contained in:
nhmall
2022-10-09 09:35:24 -04:00
parent 9f4b239a6f
commit 4ab2860718
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sys/msdos/font.c
View File

@@ -21,7 +21,7 @@ load_font(const char *filename)
uint32 magic;
uint32 version;
uint32 headersize;
uint32 flags;
uint32 fontflags;
uint32 length;
uint32 charsize;
uint32 height;
@@ -43,7 +43,7 @@ load_font(const char *filename)
if (version != 0) goto error;
headersize = read_u32(header + 8);
if (headersize < sizeof(header)) goto error;
flags = read_u32(header + 12);
fontflags = read_u32(header + 12);
length = read_u32(header + 16);
charsize = read_u32(header + 20);
height = read_u32(header + 24);
@@ -77,7 +77,7 @@ load_font(const char *filename)
fseek(fp, charsize - memsize, SEEK_CUR);
}
if (flags & 0x01) {
if (fontflags & 0x01) {
/* Read the Unicode table */
char buf[128], buf2[128+1];
unsigned bufsize, strsize;