Merge branch 'NetHack-3.7'

include/decl.h

@@ -339,6 +339,9 @@ E const struct c_common_strings c_common_strings;
 /* material strings */
 E const char *materialnm[];
 
+/* empty string that is non-const for parameter use */
+E char emptystr[];
+
 /* Monster name articles */
 #define ARTICLE_NONE 0
 #define ARTICLE_THE 1

include/system.h

@@ -573,4 +573,10 @@ E int FDECL(atoi, (const char *));
 #include "lualib.h"
 #include "lauxlib.h"
 
+#if defined(WIN32)
+#define LUA_INTCAST(i) ((int) i)
+#else
+#define LUA_INTCAST(i) (i)
+#endif
+
 #endif /* SYSTEM_H */