Merge branch 'NetHack-3.6.2'

include/ntconf.h

@@ -94,6 +94,15 @@ extern void FDECL(interject, (int));
  *===============================================
  */
 
+#ifdef __MINGW32__
+#ifdef strncasecmp
+#undef strncasecmp
+#endif
+#ifdef strcasecmp
+#undef strcasecmp
+#endif
+#endif
+ 
 #ifdef _MSC_VER
 #if (_MSC_VER > 1000)
 /* Visual C 8 warning elimination */

include/winX.h

@@ -165,6 +165,7 @@ struct menu_info_t {
     boolean cancelled; /* Menu has been explicitly cancelled. */
     boolean counting;  /* true when menu_count has a valid value */
     boolean permi;
+    boolean disable_mcolors; /* disable menucolors */
 
     int permi_x, permi_y; /* perm_invent window x,y */
     int permi_w, permi_h; /* perm_invent window wid, hei */

include/wincurs.h

@@ -7,16 +7,11 @@
 
 /* Global declarations for curses interface */
 
-int term_rows, term_cols; /* size of underlying terminal */
-
-WINDOW *base_term;    /* underlying terminal window */
-
-WINDOW *mapwin, *statuswin, *messagewin;    /* Main windows */
-
-int orig_cursor;	/* Preserve initial cursor state */
-
-boolean counting;   /* Count window is active */
-
+extern int term_rows, term_cols;   /* size of underlying terminal   */
+extern int orig_cursor; 	   /* Preserve initial cursor state */
+extern WINDOW *base_term;          /* underlying terminal window    */
+extern boolean counting;           /* Count window is active        */
+extern WINDOW *mapwin, *statuswin, *messagewin;    /* Main windows  */
 
 #define TEXTCOLOR   /* Allow color */
 #define NHW_END 19