Merge branch 'keni-wincw2' into NetHack-3.7

Lots of manually resolved conflicts.

src/allmain.c

@@ -908,7 +908,7 @@ static const struct early_opt earlyopts[] = {
 #ifdef WIN32
     { ARG_WINDOWS, "windows", 4, TRUE },
 #endif
-#ifdef CRASHREPORT
+#if defined(CRASHREPORT)
     { ARG_BIDSHOW, "bidshow", 7, FALSE },
 #endif
 };
@@ -932,8 +932,9 @@ argcheck(int argc, char *argv[], enum earlyarg e_arg)
     const char *dashdash = "";
 
     for (idx = 0; idx < SIZE(earlyopts); idx++) {
-        if (earlyopts[idx].e == e_arg)
+        if (earlyopts[idx].e == e_arg){
             break;
+	}
     }
     if (idx >= SIZE(earlyopts) || argc < 1)
         return 0;