From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 31 Dec 2020 04:45:27 +0000 (+0100)
Subject: Drop macros AGREE_FREE, AGREE_PROPOSED, AGREE_SIGNED
X-Git-Tag: v4.4.1~45
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=87952c7f7c263dd2f4155982a3079dd5c1848663;hp=7714a8cb82eda6fb99e3c70d94843fba70c1ffb4

Drop macros AGREE_FREE, AGREE_PROPOSED, AGREE_SIGNED

Commit 555de3100 (v4.3.0) added these macros so xdump tables loan and
treaty can share an agreement_statuses table.  Treaties are gone since
commit a109de948 (v4.3.33).  Drop the macros.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/include/loan.h b/include/loan.h
index 16f432481..c4819cf65 100644
--- a/include/loan.h
+++ b/include/loan.h
@@ -58,9 +58,9 @@ struct lonstr {
     time_t l_duedate;		/* date after which interest doubles, etc */
 };
 
-#define LS_FREE		AGREE_FREE
-#define LS_PROPOSED	AGREE_PROPOSED
-#define LS_SIGNED	AGREE_SIGNED
+#define LS_FREE		0
+#define LS_PROPOSED	1
+#define LS_SIGNED	2
 
 extern double loan_owed(struct lonstr *loan, time_t paytime);
 
diff --git a/include/misc.h b/include/misc.h
index b580633ae..9f4771b3e 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -108,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
diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c
index 24f658d50..9101fa15a 100644
--- a/src/lib/global/symbol.c
+++ b/src/lib/global/symbol.c
@@ -27,12 +27,13 @@
  *  symbol.c: Empire symbol tables
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2006-2016
+ *     Markus Armbruster, 2006-2020
  */
 
 #include <config.h>
 
 #include "land.h"
+#include "loan.h"
 #include "misc.h"
 #include "mission.h"
 #include "nat.h"
@@ -46,9 +47,9 @@
 #include "ship.h"
 
 struct symbol agreement_statuses[] = {
-    {AGREE_FREE, "free"},
-    {AGREE_PROPOSED, "proposed"},
-    {AGREE_SIGNED, "signed"},
+    {LS_FREE, "free"},
+    {LS_PROPOSED, "proposed"},
+    {LS_SIGNED, "signed"},
     {0, NULL}
 };