upgrade to 3.6.2

[jnethack/source.git] / include / vmsconf.h

diff --git a/include/vmsconf.h b/include/vmsconf.h
index 75e732a..a815e70 100644 (file)
--- a/include/vmsconf.h
+++ b/include/vmsconf.h
@@ -1,5 +1,6 @@
-/* NetHack 3.6 vmsconf.h       $NHDT-Date: 1432512780 2015/05/25 00:13:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.22 $ */
+/* NetHack 3.6 vmsconf.h       $NHDT-Date: 1555361299 2019/04/15 20:48:19 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.30 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
+/*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #ifdef VMS
@@ -159,6 +160,12 @@ PANICTRACE_GDB=2  #at conclusion of panic, show a call traceback and then
 
 #define RANDOM /* use sys/share/random.c instead of vaxcrtl rand */
 
+/* config.h defines USE_ISAAC64; we'll use it on Alpha or IA64 but not VAX;
+   it overrides RANDOM */
+#if (defined(VAX) || defined(vax) || defined(__vax)) && defined(USE_ISAAC64)
+#undef ISAAC64
+#endif
+
 #define FCMASK 0660 /* file creation mask */
 
 /*
@@ -236,23 +243,30 @@ typedef __mode_t mode_t;
 
 #define tgetch vms_getchar
 
+#if defined(__DECC_VER) && (__DECC_VER >= 50000000)
+ /* for cc/Standard=ANSI89, suppress notification that '$' in identifiers
+    is an extension; sys/vms/*.c needs it regardless of strict ANSI mode */
+# pragma message disable DOLLARID
+#endif
+
 #include "system.h"
 
 #define index strchr
 #define rindex strrchr
 
 /* Use the high quality random number routines. */
-#if defined(RANDOM)
-#define Rand() random()
+#ifndef USE_ISAAC64
+# if defined(RANDOM)
+#  define Rand() random()
 /* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied
-   code to avoid having to deal with version-specific conditionalized builds
-   */
-#define random nh_random
-#define srandom nh_srandom
-#define initstate nh_initstate
-#define setstate nh_setstate
-#else
-#define Rand() rand()
+   code to avoid having to deal with version-specific conditionalized builds */
+#  define random nh_random
+#  define srandom nh_srandom
+#  define initstate nh_initstate
+#  define setstate nh_setstate
+# else
+#  define Rand() rand()
+# endif
 #endif
 
 #ifndef __GNUC__
@@ -267,7 +281,7 @@ typedef __mode_t mode_t;
 #define link(f1, f2) vms_link(f1, f2)   /* vmsfiles.c */
 #define open(f, k, m) vms_open(f, k, m) /* vmsfiles.c */
 #define fopen(f, m) vms_fopen(f, m)     /* vmsfiles.c */
-/* #define unlink(f0)  vms_unlink(f0)          /* vmsfiles.c */
+/* #define unlink(f0) vms_unlink(f0)       /* vmsfiles.c */
 #ifdef VERYOLD_VMS
 #define unlink(f0) delete (f0) /* vaxcrtl */
 #else