Merge branch 'master' into NetHack-3.7

2019-07-13 00:38:40 -04:00
parent 1469ccbd06 77fd719e05
commit 505c1e4b02
27 changed files with 123 additions and 89 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -382,5 +382,10 @@ struct savefile_info {
 #define nhassert(e) ((void)0)
 #endif

+/* Supply nhassert macro if not supplied by port */
+#ifndef nhassert
+#define nhassert(expression) (void)((!!(expression)) || \
+        (nhassert_failed(__FILE__, __LINE__), 0))
+#endif

 #endif /* GLOBAL_H */