more warning cleanup (trunk only)

More warning bits that never got committed.
More appropriate compiler flags for warning checks (macosx only for the moment).
The changes in dgn*[lc] just rename line_number to nh_line_number to avoid a
clash, so no need to regenerate the lex output.

src/cmd.c

@@ -160,7 +160,7 @@ STATIC_DCL char FDECL(cmd_from_func, (int NDECL((*))));
 STATIC_PTR int NDECL(doattributes);
 STATIC_PTR int NDECL(doconduct); /**/
 
-STATIC_DCL void FDECL(enlght_line, (const char *,const char *,const char *,char *));
+STATIC_DCL void FDECL(enlght_line, (const char *,const char *,const char *,const char *));
 STATIC_DCL char *FDECL(enlght_combatinc, (const char *,int,int,char *));
 STATIC_DCL void FDECL(enlght_halfdmg, (int,int));
 STATIC_DCL boolean NDECL(walking_on_water);
@@ -991,8 +991,7 @@ static const char
 
 static void
 enlght_line(start, middle, end, ps)
-const char *start, *middle, *end;
-char *ps;
+const char *start, *middle, *end, *ps;
 {
 	char buf[BUFSZ];
 

src/dungeon.c

@@ -2069,7 +2069,7 @@ recalc_mapseen()
 {
 	mapseen *mptr;
 	struct monst *shkp;
-	int x, y, ridx;
+	unsigned int x, y, ridx;
 
 	/* Should not happen in general, but possible if in the process
 	 * of being booted from the quest.  The mapseen object gets

src/files.c

@@ -2553,7 +2553,7 @@ parse_sym_line(buf, which_set)
 char *buf;
 int which_set;
 {
-	int i, val;
+	int val;
 	struct symparse *symp = (struct symparse *)0;
 	char *bufp, *commentp, *altp;
 
@@ -2715,10 +2715,10 @@ int which_set;
 			    break;
 		   case 5:  /* restrictions: xxxx*/
 			    if (chosen_symset_start) {
-			        i = 0;
-			        while (known_restrictions[i]) {
-				    if (!strcmpi(known_restrictions[i], bufp)) {
-				    switch(i) {
+			        int n = 0;
+			        while (known_restrictions[n]) {
+				    if (!strcmpi(known_restrictions[n], bufp)) {
+				    switch(n) {
 				    	case  0: symset[which_set].primary = 1;
 						 break;
 					case  1: symset[which_set].rogue   = 1;
@@ -2728,7 +2728,7 @@ int which_set;
 				    }
 				    break;	/* while loop */
 	    	        	    }
-				    i++;
+				    n++;
 		    	        }
 			        /* Don't allow unicode set if code can't handle it */
 			        if (symset[which_set].unicode &&