From 98b392d72c32f8aad65f48fc84c01f45ae5f1393 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 1 Mar 2004 13:32:06 +0000
Subject: [PATCH] (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.

---
 include/var.h           | 1 +
 src/lib/subs/takeover.c | 2 --
 src/lib/update/revolt.c | 7 -------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/var.h b/include/var.h
index dd5ddfc1..6aa7fb42 100644
--- 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 7c0a3e29..02951408 100644
--- 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 9cba5330..93c6ad08 100644
--- 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)
 {