fix SYSCF so that things build when first defined

Things won't build for ports that first
define SYSCF.

This moves assure_syscf_file() from unixmain.c
to files.c and adjusts extern.h to get it
out from under #ifdef UNIX.

The call to assure_syscf_file() in options.c was
only #ifdef SYSCF, SYSCF_FILE and not UNIX,
so new ports #defining SYSCF would get an erro.

assure_syscf_file() will be utilized by mswin
when SYSCF is defined.

diff --git a/include/extern.h b/include/extern.h
index 1ba3e110fffb224faa9435c876c08886cf28e496..da9bf7effb331a5681221307d09182bbc9f9eb2b 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 extern.h        $NHDT-Date: 1426496453 2015/03/16 09:00:53 $  $NHDT-Branch: master $:$NHDT-Revision: 1.407 $ */
+/* NetHack 3.5 extern.h        $NHDT-Date: 1426966688 2015/03/21 19:38:08 $  $NHDT-Branch: master $:$NHDT-Revision: 1.411 $ */
 /* NetHack 3.5 extern.h        $Date: 2013/11/05 00:57:53 $  $Revision: 1.380 $ */
 /* Copyright (c) Steve Creps, 1988.                              */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -739,6 +739,9 @@ E void FDECL(free_saved_games, (char**));
 #ifdef SELF_RECOVER
 E boolean NDECL(recover_savefile);
 #endif
+#ifdef SYSCF_FILE
+E void NDECL(assure_syscf_file);
+#endif
 #ifdef HOLD_LOCKFILE_OPEN
 E void NDECL(really_close);
 #endif
@@ -2288,9 +2291,6 @@ E void NDECL(port_help);
 E void FDECL(sethanguphandler, (void (*)(int)));
 E boolean NDECL(authorize_wizard_mode);
 E boolean FDECL(check_user_string, (char *));
-# ifdef SYSCF_FILE
-E void NDECL(assure_syscf_file);
-# endif
 #endif /* UNIX */
 
 /* ### unixtty.c ### */

diff --git a/include/ntconf.h b/include/ntconf.h
index 95a506635891757b3b16d2269c36892e4e59689b..b5145915142cc306f80c5262b7c2784ff2d1016b 100644 (file)
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -1,4 +1,4 @@
-/* NetHack 3.5 ntconf.h        $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 ntconf.h        $NHDT-Date: 1426966690 2015/03/21 19:38:10 $  $NHDT-Branch: master $:$NHDT-Revision: 1.37 $ */
 /* NetHack 3.5 ntconf.h        $Date: 2012/01/15 19:11:38 $  $Revision: 1.35 $ */
 /*     SCCS Id: @(#)ntconf.h   3.5     2002/03/10      */
 /* Copyright (c) NetHack PC Development Team 1993, 1994.  */
@@ -25,6 +25,9 @@
 
 #define SELF_RECOVER           /* Allow the game itself to recover from an aborted game */
 
+#define SYSCF                  /* Use a global configuration */
+#define SYSCF_FILE "sysconf"   /* Use a file to hold the SYSCF configuration */
+
 #define USER_SOUNDS
 
 #ifdef WIN32CON

diff --git a/src/files.c b/src/files.c
index a6f17b9063012c36eab9e22f8575e15d9676de68..e85a85ae410d2d8aa3e0b2476c727eea3c4583e9 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 files.c $NHDT-Date: 1426544796 2015/03/16 22:26:36 $  $NHDT-Branch: master $:$NHDT-Revision: 1.134 $ */
+/* NetHack 3.5 files.c $NHDT-Date: 1426966692 2015/03/21 19:38:12 $  $NHDT-Branch: master $:$NHDT-Revision: 1.135 $ */
 /* NetHack 3.5 files.c $Date: 2012/03/10 02:49:08 $  $Revision: 1.124 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -3199,6 +3199,29 @@ int ifd, ofd;
 /* ----------  END INTERNAL RECOVER ----------- */
 #endif /*SELF_RECOVER*/
 
+/* ----------  OTHER ----------- */
+
+#ifdef SYSCF
+# ifdef SYSCF_FILE
+void
+assure_syscf_file() {
+       /* All we really care about is the end result - can we read the file?
+        * So just check that directly. */
+       int fd;
+       fd = open(SYSCF_FILE, O_RDONLY);
+       if(fd >= 0){
+               /* readable */
+               close(fd);
+               return;
+       }
+       raw_printf("Unable to open SYSCF_FILE.\n");
+       exit(EXIT_FAILURE);
+}
+
+# endif /* SYSCF_FILE */
+#endif /* SYSCF */
+
+
 #ifdef DEBUG
 /* used by debugpline() to decide whether to issue a message
    from a partiular source file; caller passes __FILE__ and we check

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 6635c56ad3b4eba16eba8b83ac733fde306e1dc1..67ae57dba22beccfe17281475282a0b85f4fc5f7 100644 (file)
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -1,9 +1,9 @@
-/* NetHack 3.5 pcmain.c        $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 pcmain.c        $NHDT-Date: 1426966701 2015/03/21 19:38:21 $  $NHDT-Branch: master $:$NHDT-Revision: 1.51 $ */
 /* NetHack 3.5 pcmain.c        $Date: 2012/01/20 03:41:31 $  $Revision: 1.48 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
-/* main.c - MSDOS, OS/2, ST, Amiga, and NT NetHack */
+/* main.c - MSDOS, OS/2, ST, Amiga, and Windows NetHack */
 
 #include "hack.h"
 #include "dlb.h"
@@ -244,6 +244,9 @@ char *argv[];
 
 #if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
                        chdirx(hackdir,0);
+#endif
+#ifdef SYSCF
+                       initoptions();
 #endif
                        prscore(argc, argv);
                        nethack_exit(EXIT_SUCCESS);

diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index c470dc6e02e5d0b7ec55892c86c706a572fecc19..f7f1ac87e7ff98897a32dcaee8f342aff14b1df4 100644 (file)
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5 unixmain.c      $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5 unixmain.c      $NHDT-Date: 1426966705 2015/03/21 19:38:25 $  $NHDT-Branch: master $:$NHDT-Revision: 1.44 $ */
 /* NetHack 3.5 unixmain.c      $Date: 2012/01/27 20:15:31 $  $Revision: 1.42 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -648,20 +648,4 @@ get_unix_pw()
        return pw;
 }
 
-#ifdef SYSCF_FILE
-void
-assure_syscf_file(){
-       /* All we really care about is the end result - can we read the file?
-        * So just check that directly. */
-       int fd;
-       fd = open(SYSCF_FILE, O_RDONLY);
-       if(fd >= 0){
-               /* readable */
-               close(fd);
-               return;
-       }
-       raw_printf("Unable to open SYSCF_FILE.\n");
-       exit(EXIT_FAILURE);
-}
-#endif
 /*unixmain.c*/