Merge branch 'NetHack-3.6.2'

include/.gitignore

@@ -6,3 +6,4 @@ vis_tab.h
 dgn_comp.h
 lev_comp.h
 tile.h
+win32api.h

include/global.h

@@ -60,9 +60,14 @@
  * since otherwise comparisons with signed quantities are done incorrectly
  */
 typedef schar xchar;
+#if defined(__GNUC__) && defined(WIN32) && defined(__cplusplus)
+/* Resolve conflict with Qt 5 and MinGW-w32 */
+typedef uchar boolean; /* 0 or 1 */
+#else
 #ifndef SKIP_BOOLEAN
 typedef xchar boolean; /* 0 or 1 */
 #endif
+#endif
 
 #ifndef TRUE /* defined in some systems' native include files */
 #define TRUE ((boolean) 1)