X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fmisc.h;h=9f4771b3e27431b6c151a211a4d7897e7c02d50c;hp=cce94dfc0f99e50a3c12c242761416b9361e7311;hb=87952c7f7c263dd2f4155982a3079dd5c1848663;hpb=9f25de3dce4ec1326337b6ce2f6a68046a014e65

diff --git a/include/misc.h b/include/misc.h
index cce94dfc0..9f4771b3e 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
  *
  *  Known contributors to this file:
  *     Doug Hay, 1998
- *     Markus Armbruster, 2004-2014
+ *     Markus Armbruster, 2004-2020
  */
 
 #ifndef MISC_H
@@ -52,7 +52,7 @@
 #endif
 
 #ifndef bit
-#define bit(x)		(1<<(x))
+#define bit(x)		(1U<<(x))
 #endif
 
 #define minutes(x)	(60*(x))
@@ -75,6 +75,25 @@
 extern void oops(char *, char *, int);
 extern void (*oops_handler)(void);
 
+/*
+ * Assert constant expression @cond, return 1.
+ * If @cond is zero, force a compilation error.
+ */
+#define BUILD_ASSERT_ONE(cond) \
+    (sizeof(char[1 - 2 * !(cond)]))
+
+/*
+ * Assert constant expression @cond.
+ * If @cond is zero, force a compilation error.
+ */
+#define BUILD_ASSERT(cond) \
+    ((void)BUILD_ASSERT_ONE(cond))
+
+/*
+ * Number of elements in ARRAY.
+ */
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+
 void exit_nomem(void) ATTRIBUTE((noreturn));
 
 	/* return codes from command routines */
@@ -89,8 +108,4 @@ extern char *ugetstring(char *prompt, char buf[]);
 extern char *prbuf(char *format, ...)
     ATTRIBUTE((format (printf, 1, 2)));
 
-#define AGREE_FREE	0
-#define AGREE_PROPOSED	1
-#define AGREE_SIGNED	2
-
 #endif