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

fix github issue #346 - duplicate 'head_engr' defs

Browse Source 
Post-3.6.x issue.  head_engr has been defined in engrave.c for ages
but the definition was relatively recently duplicated in decl.c.
gcc 10 defaults to more rigorous checking (-fno-common) and complained
about the duplicate.  Remove the original definition from engrave.c.

Fixes #346
This commit is contained in:
PatR
2020-05-18 11:46:23 -07:00
parent ce4658abd6
commit 82ccfaa3ac
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.222 $ $NHDT-Date: 1589698870 2020/05/17 07:01:10 $
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.223 $ $NHDT-Date: 1589827569 2020/05/18 18:46:09 $
General Fixes and Modified Features
-----------------------------------
@@ -245,6 +245,9 @@ after the wish parsing change, wishing for "<something of monster>" or for
"<monster something>" worked as intended but wishing for "<monster>"
(where <monster> used the canonical spelling) triggered a crash
fix new "objects[0] class #1 not in order!" panic if plain 'char' is unsigned
only generate shop items on solid floor squares
avoid gcc 10 warning by removing duplicate definition of 'head_engr'
tty: redraw unexplored locations as S_unexplored rather than <space> after
map has been partially overwritten by popup menu or text display
tty: previous change resulted in remnants of previous level being shown on
@@ -253,7 +256,6 @@ X11: was still initializing map to 'stone' instead of 'unexplored' after they
became separate glyphs
X11: for text map without color, add support for black&white ice; draw it in
inverse video to distinguish from ordinary floor
only generate shop items on solid floor squares
Platform- and/or Interface-Specific Fixes

3
src/engrave.c
View File

@@ -1,11 +1,10 @@
/* NetHack 3.6 engrave.c $NHDT-Date: 1570318925 2019/10/05 23:42:05 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.75 $ */
/* NetHack 3.6 engrave.c $NHDT-Date: 1589827569 2020/05/18 18:46:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.97 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
#include "hack.h"
struct engr *head_engr;
static const char *NDECL(blengr);
char *