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 16f4324811639418a5ceb3c36a01d3c6ff170e4c..c4819cf65583e43f1a1f291da227310afaf34ec0 100644 (file)
--- 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 b580633ae904759de6cc9dc60533a1f9d256655d..9f4771b3e27431b6c151a211a4d7897e7c02d50c 100644 (file)
--- 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 24f658d5098e60e215e1cb8b5437d365f41f3b5d..9101fa15ac36909997d68cd31d20045068d0f9ee 100644 (file)
--- 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}
 };