bits

- catch up on a couple of DOS bits
- fix a copy-and-paste error on hack.c function

diff --git a/include/pcconf.h b/include/pcconf.h
index 4dbf6b3e7dc74eb8f3e784f76aa43f57a1d13513..af0d1038dbebe60a85ae7ecedf64a3742f9fe512 100644 (file)
--- a/include/pcconf.h
+++ b/include/pcconf.h
@@ -314,7 +314,7 @@
 #define FILENAME_CMP  stricmp                /* case insensitive */
 #endif
 
-#ifdef MSC7_WARN       /* define with cl /DMSC7_WARN   */
+#if defined(_MSC_VER) && (_MSC_VER >= 7)
 #pragma warning(disable:4131)
 #endif
 

diff --git a/src/hack.c b/src/hack.c
index df33a4e84e12339b7b336754b04a88098c4d853a..a5b52c8d1b815726b92c6bf47fe83c8ac58ee44a 100644 (file)
--- a/src/hack.c
+++ b/src/hack.c
@@ -32,7 +32,7 @@ unsigned ui;
 
 anything *
 long_to_any(lng)
-unsigned lng;
+long lng;
 {
     tmp_anything = zeroany;
     tmp_anything.a_long = lng;

diff --git a/sys/msdos/vidvga.c b/sys/msdos/vidvga.c
index 9ac0363e313461f66b647f9547d696b3cdadd167..136bf5d12034dd5bbbaa8a1bed072910443c61b2 100644 (file)
--- a/sys/msdos/vidvga.c
+++ b/sys/msdos/vidvga.c
@@ -1,4 +1,4 @@
-/*   SCCS Id: @(#)vidvga.c   3.5     1996/02/16                          */
+/*   SCCS Id: @(#)vidvga.c   3.5     2006/07/08                          */
 /*   Copyright (c) NetHack PC Development Team 1995                 */
 /*   NetHack may be freely redistributed.  See license for details. */
 /*
@@ -1153,7 +1153,7 @@ int chr,col,color;
        egawriteplane(15);
 }
 
-#  endif POSITIONBAR
+#  endif /*POSITIONBAR*/
 
 #  ifdef SIMULATE_CURSOR
 

diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 3d917509ee15d8bcb081969a17a6b862dd757551..12804c45d0bc1a107d4a906423314b2d6ce6e775 100644 (file)
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)pcmain.c   3.5     2006/04/01      */
+/*     SCCS Id: @(#)pcmain.c   3.5     2006/07/08      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -6,7 +6,11 @@
 
 #include "hack.h"
 #include "dlb.h"
+#ifdef SHORT_FILENAMES
+#include "patchlev.h"
+#else
 #include "patchlevel.h"
+#endif
 
 #ifndef NO_SIGNAL
 #include <signal.h>