From: PatR Date: Wed, 2 Mar 2016 08:37:56 +0000 (-0800) Subject: address #H4266 - build problem with clang Modules X-Git-Tag: NetHack-3.6.1_RC01~892 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a5fb72787412a9989b3ca80b529688265331bc8;p=nethack address #H4266 - build problem with clang Modules Report states that using OSX Xcode IDE results in use of 'clang Modules', whatever those are, and role.c's 'filter' struct ends up conflicting with a function declared by (or possibly since one includes the other). src/role.c does not include , so this smacks of the problems caused by using precompiled headers on pre-OSX Mac. Instead of trying to import nethack into Xcode, I temporarily inserted '#include ' at the end of unixconf.h. gcc did complain about 'filter' in role.c (but not in invent.c, despite -Wshadow), and then complained about termcap.c using TRUE when it wasn't defined (after in had been #undef'd, where there's a comment stating that it won't be used in the rest of that file), and also complained about static function winch() in wintty.c conflicting with external winch() in curses. This renames 'filter' and 'winch()' to things that won't conflict. Also, our winch() is a signal handler but had the wrong signature for one. And the troublesome use of TRUE was in code that was supposed to be dealing with int rather than boolean. --- diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 389dc5ee8..2f3314620 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -182,6 +182,8 @@ tty: specifying all four of role, race, gender, and alignment still prompted for confirmation with "Is this ok?" before starting play tty: responding with or during role, race, &c selection behaved same as to quit; now it will pick [random] instead +tty: rename struct variable 'filter' (role.c) and function 'winch()' (wintty.c) + to avoid conflicts with unix/X11: in top level Makefile, some commented out definitions of VARDATND misspelled pilemark.xbm (as pilemark.xpm) unix: options file with CR+LF line ends and an invalid option line resulted in diff --git a/src/invent.c b/src/invent.c index 250352b38..4ca6b8a07 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 invent.c $NHDT-Date: 1456354616 2016/02/24 22:56:56 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.195 $ */ +/* NetHack 3.6 invent.c $NHDT-Date: 1456907837 2016/03/02 08:37:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.196 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1437,7 +1437,7 @@ boolean combo; /* combination menu flag */ unsigned *resultflags; { int FDECL((*ckfn), (OBJ_P)) = (int FDECL((*), (OBJ_P))) 0; - boolean FDECL((*filter), (OBJ_P)) = (boolean FDECL((*), (OBJ_P))) 0; + boolean FDECL((*ofilter), (OBJ_P)) = (boolean FDECL((*), (OBJ_P))) 0; boolean takeoff, ident, allflag, m_seen; int itemcount; int oletct, iletct, unpaid, oc_of_sym; @@ -1455,13 +1455,13 @@ unsigned *resultflags; add_valid_menu_class(0); /* reset */ if (taking_off(word)) { takeoff = TRUE; - filter = is_worn; + ofilter = is_worn; } else if (!strcmp(word, "identify")) { ident = TRUE; - filter = not_fully_identified; + ofilter = not_fully_identified; } - iletct = collect_obj_classes(ilets, invent, FALSE, filter, &itemcount); + iletct = collect_obj_classes(ilets, invent, FALSE, ofilter, &itemcount); unpaid = count_unpaid(invent); if (ident && !iletct) { diff --git a/src/role.c b/src/role.c index 1c6d3e1a5..0657eb4f0 100644 --- a/src/role.c +++ b/src/role.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 role.c $NHDT-Date: 1453514597 2016/01/23 02:03:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.36 $ */ +/* NetHack 3.6 role.c $NHDT-Date: 1456907852 2016/03/02 08:37:32 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.37 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */ /* NetHack may be freely redistributed. See license for details. */ @@ -768,7 +768,7 @@ const struct Align aligns[] = { static struct { boolean roles[SIZE(roles)]; short mask; -} filter; +} rfilter; STATIC_DCL int NDECL(randrole_filtered); STATIC_DCL char *FDECL(promptsep, (char *, int)); @@ -1046,7 +1046,7 @@ int rolenum, racenum, gendnum, alignnum; short allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1) { - if (filter.roles[rolenum]) + if (rfilter.roles[rolenum]) return FALSE; allow = roles[rolenum].allow; if (racenum >= 0 && racenum < SIZE(races) - 1 @@ -1062,7 +1062,7 @@ int rolenum, racenum, gendnum, alignnum; } else { /* random; check whether any selection is possible */ for (i = 0; i < SIZE(roles) - 1; i++) { - if (filter.roles[i]) + if (rfilter.roles[i]) continue; allow = roles[i].allow; if (racenum >= 0 && racenum < SIZE(races) - 1 @@ -1114,7 +1114,7 @@ int rolenum, racenum, gendnum, alignnum; short allow; if (racenum >= 0 && racenum < SIZE(races) - 1) { - if (filter.mask & races[racenum].selfmask) + if (rfilter.mask & races[racenum].selfmask) return FALSE; allow = races[racenum].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1130,7 +1130,7 @@ int rolenum, racenum, gendnum, alignnum; } else { /* random; check whether any selection is possible */ for (i = 0; i < SIZE(races) - 1; i++) { - if (filter.mask & races[i].selfmask) + if (rfilter.mask & races[i].selfmask) continue; allow = races[i].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1187,7 +1187,7 @@ int alignnum UNUSED; short allow; if (gendnum >= 0 && gendnum < ROLE_GENDERS) { - if (filter.mask & genders[gendnum].allow) + if (rfilter.mask & genders[gendnum].allow) return FALSE; allow = genders[gendnum].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1200,7 +1200,7 @@ int alignnum UNUSED; } else { /* random; check whether any selection is possible */ for (i = 0; i < ROLE_GENDERS; i++) { - if (filter.mask & genders[i].allow) + if (rfilter.mask & genders[i].allow) continue; allow = genders[i].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1256,7 +1256,7 @@ int alignnum; short allow; if (alignnum >= 0 && alignnum < ROLE_ALIGNS) { - if (filter.mask & aligns[alignnum].allow) + if (rfilter.mask & aligns[alignnum].allow) return FALSE; allow = aligns[alignnum].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1269,7 +1269,7 @@ int alignnum; } else { /* random; check whether any selection is possible */ for (i = 0; i < ROLE_ALIGNS; i++) { - if (filter.mask & aligns[i].allow) + if (rfilter.mask & aligns[i].allow) return FALSE; allow = aligns[i].allow; if (rolenum >= 0 && rolenum < SIZE(roles) - 1 @@ -1356,13 +1356,13 @@ const char *bufp; boolean reslt = TRUE; if ((i = str2role(bufp)) != ROLE_NONE && i != ROLE_RANDOM) - filter.roles[i] = TRUE; + rfilter.roles[i] = TRUE; else if ((i = str2race(bufp)) != ROLE_NONE && i != ROLE_RANDOM) - filter.mask |= races[i].selfmask; + rfilter.mask |= races[i].selfmask; else if ((i = str2gend(bufp)) != ROLE_NONE && i != ROLE_RANDOM) - filter.mask |= genders[i].allow; + rfilter.mask |= genders[i].allow; else if ((i = str2align(bufp)) != ROLE_NONE && i != ROLE_RANDOM) - filter.mask |= aligns[i].allow; + rfilter.mask |= aligns[i].allow; else reslt = FALSE; return reslt; @@ -1373,10 +1373,10 @@ gotrolefilter() { int i; - if (filter.mask) + if (rfilter.mask) return TRUE; for (i = 0; i < SIZE(roles); ++i) - if (filter.roles[i]) + if (rfilter.roles[i]) return TRUE; return FALSE; } @@ -1387,8 +1387,8 @@ clearrolefilter() int i; for (i = 0; i < SIZE(roles); ++i) - filter.roles[i] = FALSE; - filter.mask = 0; + rfilter.roles[i] = FALSE; + rfilter.mask = 0; } #define BP_ALIGN 0 @@ -1836,7 +1836,7 @@ boolean preselect; what = "role"; f = r; for (i = 0; i < SIZE(roles); ++i) - if (i != f && !filter.roles[i]) + if (i != f && !rfilter.roles[i]) break; if (i == SIZE(roles)) { constrainer = "filter"; @@ -1855,7 +1855,7 @@ boolean preselect; constrainer = "role"; forcedvalue = races[c].noun; } else if (f >= 0 - && (allowmask & ~filter.mask) == races[f].selfmask) { + && (allowmask & ~rfilter.mask) == races[f].selfmask) { /* if there is only one race choice available due to user options disallowing others, race menu entry is disabled */ constrainer = "filter"; @@ -1877,7 +1877,7 @@ boolean preselect; constrainer = "role"; forcedvalue = genders[g].adj; } else if (f >= 0 - && (allowmask & ~filter.mask) == genders[f].allow) { + && (allowmask & ~rfilter.mask) == genders[f].allow) { /* if there is only one gender choice available due to user options disallowing other, gender menu entry is disabled */ constrainer = "filter"; @@ -1912,7 +1912,7 @@ boolean preselect; constrainer = "race"; } if (f >= 0 && !constrainer - && (ROLE_ALIGNMASK & ~filter.mask) == aligns[f].allow) { + && (ROLE_ALIGNMASK & ~rfilter.mask) == aligns[f].allow) { /* if there is only one alignment choice available due to user options disallowing others, algn menu entry is disabled */ constrainer = "filter"; diff --git a/win/tty/termcap.c b/win/tty/termcap.c index 262c89a46..5add02ac3 100644 --- a/win/tty/termcap.c +++ b/win/tty/termcap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 termcap.c $NHDT-Date: 1447234979 2015/11/11 09:42:59 $ $NHDT-Branch: master $:$NHDT-Revision: 1.23 $ */ +/* NetHack 3.6 termcap.c $NHDT-Date: 1456907853 2016/03/02 08:37:33 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.24 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1246,6 +1246,7 @@ int color; xputs(hilites[color]); } +/* not to be confused with has_colors() in unixtty.c */ int has_color(color) int color; @@ -1253,23 +1254,24 @@ int color; #ifdef X11_GRAPHICS /* XXX has_color() should be added to windowprocs */ if (windowprocs.name != NULL && !strcmpi(windowprocs.name, "X11")) - return TRUE; + return 1; #endif #ifdef GEM_GRAPHICS /* XXX has_color() should be added to windowprocs */ if (windowprocs.name != NULL && !strcmpi(windowprocs.name, "Gem")) - return TRUE; + return 1; #endif #ifdef QT_GRAPHICS /* XXX has_color() should be added to windowprocs */ if (windowprocs.name != NULL && !strcmpi(windowprocs.name, "Qt")) - return TRUE; + return 1; #endif #ifdef AMII_GRAPHICS /* hilites[] not used */ - return iflags.use_color; -#endif + return iflags.use_color ? 1 : 0; +#else return hilites[color] != (char *) 0; +#endif } #endif /* TEXTCOLOR */ diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 1e98c032b..199474869 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 wintty.c $NHDT-Date: 1453514601 2016/01/23 02:03:21 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.124 $ */ +/* NetHack 3.6 wintty.c $NHDT-Date: 1456907854 2016/03/02 08:37:34 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.125 $ */ /* Copyright (c) David Cohrs, 1991 */ /* NetHack may be freely redistributed. See license for details. */ @@ -31,8 +31,7 @@ extern void msmsg(const char *, ...); #include "wintty.h" #ifdef CLIPPING /* might want SIGWINCH */ -#if defined(BSD) || defined(ULTRIX) || defined(AIX_31) \ - || defined(_BULL_SOURCE) +#if defined(BSD) || defined(ULTRIX) || defined(AIX_31) || defined(_BULL_SOURCE) #include #endif #endif @@ -226,8 +225,21 @@ const char *mesg; } #if defined(SIGWINCH) && defined(CLIPPING) +STATIC_DCL void FDECL(winch_handler, (int)); + + /* + * This really ought to just set a flag like the hangup handler does, + * then check the flag at "safe" times, in case the signal arrives + * while something fragile is executing. Better to have a brief period + * where display updates don't fit the new size than for tty internals + * to become corrupted. + * + * 'winch_seen' has been "notyet" for a long time.... + */ +/*ARGUSED*/ STATIC_OVL void -winch() +winch_handler(sig_unused) /* signal handler is called with at least 1 arg */ +int sig_unused UNUSED; { int oldLI = LI, oldCO = CO, i; register struct WinDesc *cw; @@ -345,7 +357,7 @@ char **argv UNUSED; ttyDisplay->lastwin = WIN_ERR; #if defined(SIGWINCH) && defined(CLIPPING) && !defined(NO_SIGNAL) - (void) signal(SIGWINCH, winch); + (void) signal(SIGWINCH, (SIG_RET_TYPE) winch_handler); #endif /* add one a space forward menu command alias */