gcc compilation warning bits

diff --git a/src/mondata.c b/src/mondata.c
index 479c86817484fcd85ff14468434d6cada85738ce..a3a017e03d23e72b7f652a2b0886d6e99eb46ba7 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -107,7 +107,7 @@ struct monst *mon;
        o = is_you ? invent : mon->minvent;
        slotmask = W_ARMOR | W_RING | W_AMUL | W_TOOL;
        if (!is_you ||  /* assumes monsters don't wield non-weapons */
-               uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)))
+           (uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep))))
            slotmask |= W_WEP;
        if (is_you && u.twoweap) slotmask |= W_SWAPWEP;
        for ( ; o; o = o->nobj)
@@ -144,7 +144,7 @@ struct monst *mon;
        o = is_you ? invent : mon->minvent;
        slotmask = W_ARMOR | W_RING | W_AMUL | W_TOOL;
        if (!is_you ||  /* assumes monsters don't wield non-weapons */
-               uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)))
+           (uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep))))
            slotmask |= W_WEP;
        if (is_you && u.twoweap) slotmask |= W_SWAPWEP;
        for ( ; o; o = o->nobj)

diff --git a/win/tty/topl.c b/win/tty/topl.c
index f4889b8c18e9a3c1f45911b66ea8ebde34d51912..a8f7f10afddda51ecd6d7d14a7e2bec06254990b 100644 (file)
--- a/win/tty/topl.c
+++ b/win/tty/topl.c
@@ -591,7 +591,9 @@ boolean init;
        static boolean doneinit = FALSE;
        register struct WinDesc *cw = wins[WIN_MESSAGE];
        char *retstr = (char *)0;
+#ifdef UNICODE_WIDEWINPORT
        static char buf[BUFSZ];
+#endif
 
        if (!cw) return (char *)0;      /* bail */
        /*

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 1a75f287f13e8e132d6c8c2f191e2c8b168a31fd..f946e519a3a5fbdbc5ff4c61126eeaa11d364906 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -197,7 +197,9 @@ STATIC_DCL tty_menu_item *FDECL(reverse, (tty_menu_item *));
 STATIC_DCL const char * FDECL(compress_str, (const char *));
 STATIC_DCL void FDECL(tty_putsym, (winid, int, int, NHWCHAR_P));
 static char *FDECL(copy_of, (const char *));
+#ifdef UNICODE_WIDEWINPORT
 static nhwchar *FDECL(nhwchar_copy_of, (const nhwchar *));
+#endif
 STATIC_DCL void FDECL(bail, (const char *));   /* __attribute__((noreturn)) */
 
 /*