eliminate warnings

diff --git a/src/do_wear.c b/src/do_wear.c
index f4367a0..67cbefe 100644 (file)
--- a/src/do_wear.c
+++ b/src/do_wear.c
@@ -1670,10 +1670,6 @@ int
 dotakeoff()
 {
     struct obj *otmp = (struct obj *) 0;
-#if 1 /*JP*/
-    const char *j;
-    const char *m;
-#endif
 
     count_worn_stuff(&otmp, FALSE);
     if (!Narmorpieces && !Naccessories) {

diff --git a/src/dungeon.c b/src/dungeon.c
index 700ede6..334a49c 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1656,7 +1656,9 @@ const char *nam;
     d_level dlev;
     const char *p;
     int idx, idxtoo;
+#if 0 /*JP*/
     char buf[BUFSZ];
+#endif
     mapseen *mseen;
 
     /* look at the player's custom level annotations first */

diff --git a/src/eat.c b/src/eat.c
index a76cb14..087ea59 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -2832,8 +2832,13 @@ struct obj *otmp;
      * ability to detect food that is unfit for consumption
      * or dangerous and avoid it.
      */
+#if 0 /*JP*/
     char buf[BUFSZ], foodsmell[BUFSZ],
          it_or_they[QBUFSZ], eat_it_anyway[QBUFSZ];
+#else
+    char buf[BUFSZ], foodsmell[BUFSZ],
+         eat_it_anyway[QBUFSZ];
+#endif
     boolean cadaver = (otmp->otyp == CORPSE || otmp->globby),
             stoneorslime = FALSE;
     int material = objects[otmp->otyp].oc_material, mnum = otmp->corpsenm;

diff --git a/src/explode.c b/src/explode.c
index 848434d..ebe9838 100644 (file)
--- a/src/explode.c
+++ b/src/explode.c
@@ -54,7 +54,11 @@ int expltype;
             inside_engulfer, grabbed, grabbing;
 #endif
     coord grabxy;
+#if 0 /*JP*/
     char hallu_buf[BUFSZ], killr_buf[BUFSZ];
+#else
+    char hallu_buf[BUFSZ];
+#endif
     short exploding_wand_typ = 0;
 
     if (olet == WAND_CLASS) { /* retributive strike */

diff --git a/src/makemon.c b/src/makemon.c
index a2feaef..23f08dc 100644 (file)
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -1822,12 +1822,12 @@ struct monst *mtmp, *victim;
             mondied(mtmp);
             return (struct permonst *) 0;
         } else if (canspotmon(mtmp)) {
+#if 0 /*JP*/
             char buf[BUFSZ];
 
             /* 3.6.1:
              * Temporary (?) hack to fix growing into opposite gender.
              */
-#if 0 /*JP*/
             Sprintf(buf, "%s%s",
                     /* deal with female gnome becoming a gnome lord */
                     (mtmp->female && !fem) ? "male "

diff --git a/src/objnam.c b/src/objnam.c
index 659d939..85502d6 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -3420,7 +3420,11 @@ struct obj *no_wish;
     int eroded, eroded2, erodeproof, locked, unlocked, broken;
     int halfeaten, mntmp, contents;
     int islit, unlabeled, ishistoric, isdiluted, trapped;
+#if 0 /*JP*/
     int tmp, tinv, tvariety;
+#else
+    int tvariety;
+#endif
     int wetness, gsize = 0;
     struct fruit *f;
     int ftype = context.current_fruit;

diff --git a/src/teleport.c b/src/teleport.c
index edc3ac3..b83a4c3 100644 (file)
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -1053,9 +1053,9 @@ level_tele_trap(trap, trflags)
 struct trap *trap;
 unsigned trflags;
 {
+#if 0 /*JP*/
     char verbbuf[BUFSZ];
 
-#if 0 /*JP*/
     if ((trflags & VIASITTING) != 0)
         Strcpy(verbbuf, "trigger"); /* follows "You sit down." */
     else

diff --git a/src/topten.c b/src/topten.c
index b411325..37499ec 100644 (file)
--- a/src/topten.c
+++ b/src/topten.c
@@ -119,8 +119,10 @@ boolean incl_helpless;
     };
 #if 0 /*JP*/
     unsigned l;
-#endif
     char c, *kname = killer.name;
+#else
+    char *kname = killer.name;
+#endif
 
     buf[0] = '\0'; /* lint suppression */
 #if 1 /*JP*//*\90æ\82É\91Î\8fÛ\82ð\83R\83s\81[*/