Merge branch 'NetHack-3.6.2'

sys/winnt/windmain.c

@@ -46,6 +46,7 @@ void FDECL(windows_raw_print, (const char *));
 char FDECL(windows_yn_function, (const char *, const char *, CHAR_P));
 void FDECL(windows_getlin, (const char *, char *));
 extern int NDECL(windows_console_custom_nhgetch);
+void NDECL(safe_routines);
 
 char orgdir[PATHLEN];
 char *dir;
@@ -92,11 +93,7 @@ char *argv[];
      * Get a set of valid safe windowport function
      * pointers during early startup initialization.
      */
-    if (!WINDOWPORT("safe-startup"))
-        windowprocs = *get_safe_procs(1);
-    if (!GUILaunched)
-        windowprocs.win_nhgetch = windows_console_custom_nhgetch;
-
+    safe_routines();
     early_init();
 #ifdef _MSC_VER
 # ifdef DEBUG
@@ -569,6 +566,19 @@ nhusage()
 #undef ADD_USAGE
 }
 
+void
+safe_routines(VOID_ARGS)
+{
+    /*
+     * Get a set of valid safe windowport function
+     * pointers during early startup initialization.
+     */
+    if (!WINDOWPORT("safe-startup"))
+        windowprocs = *get_safe_procs(1);
+    if (!GUILaunched)
+        windowprocs.win_nhgetch = windows_console_custom_nhgetch;
+}
+
 #ifdef PORT_HELP
 void
 port_help()