From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 28 Aug 2017 13:25:11 +0000 (+0100)
Subject: mhparse.h: Add externs for preferred_types[], etc.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/9a87f2bf9289ef232ec8c267fd7be76120c87ca2?ds=inline;hp=a185f1ff856d4ddbe435968aca5626fe8f3d57f9

mhparse.h: Add externs for preferred_types[], etc.

Delete the local copies from other users.
---

diff --git a/h/mhparse.h b/h/mhparse.h
index 85f53267..05758908 100644
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -2,8 +2,6 @@
  *           -- (mhparse.c/mhbuildsbr.c)
  */
 
-#define	NPREFS	20
-
 /*
  * Abstract type for header fields
  */
@@ -520,3 +518,8 @@ mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
 int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t) PURE;
 void mhstoreinfo_free(mhstoreinfo_t);
 void store_all_messages (mhstoreinfo_t);
+
+#define	NPREFS	20
+extern char *preferred_types[NPREFS];
+extern char *preferred_subtypes[NPREFS];
+extern int npreferred;
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 310c4bc1..a9be19e1 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -50,11 +50,6 @@ DEFINE_SWITCH_ENUM(MHLIST);
 DEFINE_SWITCH_ARRAY(MHLIST, switches);
 #undef X
 
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 /*
  * This is currently needed to keep mhparse happy.
  * This needs to be changed.
diff --git a/uip/mhparse.c b/uip/mhparse.c
index b4e97d3d..25525679 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -45,8 +45,8 @@ int suppress_extraneous_trailing_semicolon_warning;
 int suppress_multiple_mime_version_warning = 1;
 
 /* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS],
-     *preferred_subtypes[NPREFS];
+char *preferred_types[NPREFS];
+char *preferred_subtypes[NPREFS];
 int npreferred;
 
 
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 9a1d72ff..cf38ecf1 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -67,11 +67,6 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches);
 #undef X
 
 
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 int debugsw = 0;
 int verbosw = 0;
 
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 37386405..cdb7f20f 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -47,11 +47,6 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 #define	quitser	pipeser
 
 /* mhparse.c */