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 85f532673b9a8a0950041f64a879ef96c335a35d..05758908c9aa6401de6c3ab37bd95b92d0b8232e 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -2,8 +2,6 @@
  *           -- (mhparse.c/mhbuildsbr.c)
  */
 
  *           -- (mhparse.c/mhbuildsbr.c)
  */
 

-#define        NPREFS  20
-

 /*
  * Abstract type for header fields
  */
 /*
  * 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);
 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 310c4bc1676d3ca8a125c657696fbe93c455975e..a9be19e1ca65add659a8b9e3a66949d85e693f49 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -50,11 +50,6 @@ DEFINE_SWITCH_ENUM(MHLIST);
 DEFINE_SWITCH_ARRAY(MHLIST, switches);
 #undef X
 
 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.
 /*
  * This is currently needed to keep mhparse happy.
  * This needs to be changed.

diff --git a/uip/mhparse.c b/uip/mhparse.c
index b4e97d3dca85f48db839bdfb51c3eff12b218d20..25525679c911317b3b8bca6cc02b83e5fc61bcf9 100644 (file)
--- 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 */
 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;
 
 
 int npreferred;
 
 

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 9a1d72ff9aabd5253c476f9ff76378528e239580..cf38ecf1df6c916de62ff3ab5d7e2833e5f31414 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -67,11 +67,6 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-

 int debugsw = 0;
 int verbosw = 0;
 
 int debugsw = 0;
 int verbosw = 0;
 

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 373864051ce134a07cf4d8c9e69af6103e295f14..cdb7f20f5c3c93120706ae4747763f0f51306870 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -47,11 +47,6 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-

 #define        quitser pipeser
 
 /* mhparse.c */
 #define        quitser pipeser
 
 /* mhparse.c */