Remove vestiges of old overlay source split

[trunk only]

src/objnam.c

@@ -10,9 +10,7 @@
 #define NUMOBUF 12
 
 STATIC_DCL char *FDECL(strprepend,(char *,const char *));
-#ifdef OVLB
 static boolean FDECL(wishymatch, (const char *,const char *,BOOLEAN_P));
-#endif
 static char *NDECL(nextobuf);
 static void FDECL(add_erosion_words, (struct obj *, char *));
 
@@ -29,12 +27,6 @@ struct Jitem {
 			   typ != BLACK_OPAL && 	\
 			   typ != EMERALD && typ != OPAL)))
 
-#ifndef OVLB
-
-STATIC_DCL struct Jitem Japanese_items[];
-
-#else /* OVLB */
-
 STATIC_OVL struct Jitem Japanese_items[] = {
 	{ SHORT_SWORD, "wakizashi" },
 	{ BROADSWORD, "ninja-to" },
@@ -51,12 +43,8 @@ STATIC_OVL struct Jitem Japanese_items[] = {
 	{0, "" }
 };
 
-#endif /* OVLB */
-
 STATIC_DCL const char *FDECL(Japanese_item_name,(int i));
 
-#ifdef OVL1
-
 STATIC_OVL char *
 strprepend(s,pref)
 register char *s;
@@ -73,9 +61,6 @@ register const char *pref;
 	return(s);
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 /* manage a pool of BUFSZ buffers, so callers don't have to */
 static char *
 nextobuf()
@@ -227,9 +212,6 @@ boolean juice;	/* whether or not to append " juice" to the name */
     return buf;
 }
 
-#endif /* OVLB */
-#ifdef OVL1
-
 char *
 xname(obj)
 register struct obj *obj;
@@ -500,8 +482,6 @@ struct obj *obj;
     return onm;
 }
 
-#endif /* OVL1 */
-#ifdef OVL0
 
 /* used for naming "the unique_item" instead of "a unique_item" */
 boolean
@@ -789,9 +769,6 @@ ring:
 	return(bp);
 }
 
-#endif /* OVL0 */
-#ifdef OVLB
-
 /* used from invent.c */
 boolean
 not_fully_identified(otmp)
@@ -1251,9 +1228,6 @@ static const char wrpsym[] = {
 	FOOD_CLASS
 };
 
-#endif /* OVLB */
-#ifdef OVL0
-
 /* Plural routine; chiefly used for user-defined fruits.  We have to try to
  * account for everything reasonable the player has; something unreasonable
  * can still break the code.  However, it's still a lot more accurate than
@@ -1481,19 +1455,11 @@ bottom:	if (excess) Strcpy(eos(str), excess);
 	return str;
 }
 
-#endif /* OVL0 */
-
 struct o_range {
 	const char *name, oclass;
 	int  f_o_range, l_o_range;
 };
 
-#ifndef OVLB
-
-STATIC_DCL const struct o_range o_ranges[];
-
-#else /* OVLB */
-
 /* wishable subranges of objects */
 STATIC_OVL NEARDATA const struct o_range o_ranges[] = {
 	{ "bag",	TOOL_CLASS,   SACK,	      BAG_OF_TRICKS },
@@ -2784,6 +2750,5 @@ struct monst *mtmp;
 	}
 	return "whatcha-may-callit";
 }
-#endif /* OVLB */
 
 /*objnam.c*/