Some s_char killings.

diff --git a/include/nat.h b/include/nat.h
index 612f68ecdfe0d336466351b62bcbe367410a89c7..f9ff20b14f1c2e1d7d95b753d865d7206370a34a 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -146,7 +146,7 @@ struct natstr {
 /* Coastwatch and skywatch */
 #define FOUND_COAST    3
 
-extern s_char *relates[];
+extern char *relates[];
 
 /* procedures relating to nation stuff */
 
@@ -159,10 +159,10 @@ extern double tfact(natid cn, double mult);
 extern double tfactfire(natid cn, double mult);
 extern double techfact(int level, double mult);
 
-extern s_char *cname(natid n);
-extern s_char *relatename(struct natstr *np, natid other);
-extern s_char *rejectname(struct natstr *np, natid other);
-extern s_char *natstate(struct natstr *np);
+extern char *cname(natid n);
+extern char *relatename(struct natstr *np, natid other);
+extern char *rejectname(struct natstr *np, natid other);
+extern char *natstate(struct natstr *np);
 extern int getrel(struct natstr *np, natid them);
 extern int getrejects(natid them, struct natstr *np);
 extern int getcontact(struct natstr *np, natid them);

diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c
index 387024e68036e225cd5fdca83559d29382ba0668..a39bf191a5e4a55f5a6bdeaa91a2fca148ee1924 100644 (file)
--- a/src/lib/common/nat.c
+++ b/src/lib/common/nat.c
@@ -39,13 +39,13 @@
 #include "file.h"
 #include "optlist.h"
 
-s_char *relates[] = {
+char *relates[] = {
     /* must follow nation relation defines in nat.h */
     "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
     "Allied"
 };
 
-s_char *
+char *
 cname(natid n)
 {
     struct natstr *np;
@@ -55,16 +55,16 @@ cname(natid n)
     return np->nat_cnam;
 }
 
-s_char *
+char *
 relatename(struct natstr *np, natid other)
 {
     return relates[getrel(np, other)];
 }
 
-s_char *
+char *
 rejectname(struct natstr *np, natid other)
 {
-    s_char *rejects[] = {
+    char *rejects[] = {
        /* must follow reject flags defined in nat.h */
        "  YES  YES  YES  YES",
        "  NO   YES  YES  YES",
@@ -87,7 +87,7 @@ rejectname(struct natstr *np, natid other)
     return rejects[getrejects(other, np)];
 }
 
-s_char *
+char *
 natstate(struct natstr *np)
 {
     if ((np->nat_stat & STAT_INUSE) == 0)