Make SINKS unconditional.

util/lev_main.c

@@ -494,12 +494,7 @@ char c;
 		  case '{'  : return(FOUNTAIN);
 		  case '\\' : return(THRONE);
 		  case 'K'  :
-#ifdef SINKS
 		      return(SINK);
-#else
-		      yywarning("Sinks are not allowed in this version!  Ignoring...");
-		      return(ROOM);
-#endif
 		  case '}'  : return(MOAT);
 		  case 'P'  : return(POOL);
 		  case 'L'  : return(LAVAPOOL);

util/makedefs.c

@@ -990,9 +990,6 @@ make_version()
 		/* levels and/or topology (0..4) */
 #ifdef REINCARNATION
 			| (1L <<  1)
-#endif
-#ifdef SINKS
-			| (1L <<  2)
 #endif
 		/* monsters (5..9) */
 #ifdef MAIL
@@ -1329,9 +1326,6 @@ static const char *build_opts[] = {
 #ifdef SHELL
 		"shell command",
 #endif
-#ifdef SINKS
-		"sinks",
-#endif
 #ifdef SUSPEND
 		"suspend command",
 #endif
@@ -1664,9 +1658,6 @@ h_filter(line)
     if (*line == '#') return TRUE;	/* ignore comment lines */
     if (sscanf(line, "----- %s", tag) == 1) {
 	skip = FALSE;
-#ifndef SINKS
-	if (!strcmp(tag, "SINKS")) skip = TRUE;
-#endif
     } else if (skip && !strncmp(line, "-----", 5))
 	skip = FALSE;
     return skip;