From 33fde404e7e9575dbd98c5b3a66a29e38d49fa1d Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Sat, 10 Feb 2007 17:37:17 +0000
Subject: [PATCH] gcc compilation warning bits

---
 src/mondata.c    | 4 ++--
 win/tty/topl.c   | 2 ++
 win/tty/wintty.c | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mondata.c b/src/mondata.c
index 479c86817..a3a017e03 100644
--- 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 f4889b8c1..a8f7f10af 100644
--- 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 1a75f287f..f946e519a 100644
--- 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)) */
 
 /*