(CHE_MAX): Don't define twice, define once in a header.

(get_che_cnum, set_che_cnum, get_che_value, set_che_value): Remove
redundant definitions.

diff --git a/include/var.h b/include/var.h
index dd5ddfc191d17495b6e53d047e4c0c9946ae3450..6aa7fb4258f5af47ee1cfaa95fb7750b8927ff48 100644 (file)
--- a/include/var.h
+++ b/include/var.h
@@ -95,6 +95,7 @@
 #define V_FALLOUT      V_COND(C_FALLOUT)
 
 /* should this be here?? */
+#define CHE_MAX                 255
 #define        get_che_cnum(x)         ((x) >> 8)
 #define set_che_cnum(x, cn)    ((x) = ((x) & 0xff) | ((cn) << 8))
 #define get_che_value(x)       ((x) & 0xff)

diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index 7c0a3e2925504270f8d66aee12edc21052124bd8..02951408275a5cd2a357d73af9f03685a1d62ffc 100644 (file)
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -45,8 +45,6 @@
 #include "prototypes.h"
 #include "optlist.h"
 
-#define CHE_MAX                 255
-
 void
 takeover(register struct sctstr *sp, natid newown)
 {

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 9cba533031484a6ec9c1c699de826de04663986f..93c6ad0891455dcc9c3dd40f241feb58fead5039 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -52,13 +52,6 @@
 
 static void take_casualties(struct sctstr *, int);
 
-#define        get_che_cnum(x)         ((x) >> 8)
-#define set_che_cnum(x, cn)    ((x) = ((x) & 0xff) | ((cn) << 8))
-#define get_che_value(x)       ((x) & 0xff)
-#define set_che_value(x, n)    ((x) = ((x) & 0xff00) | (n))
-
-#define        CHE_MAX                 255
-
 void
 revolt(struct sctstr *sp)
 {