From: Ralph Corderoy Date: Mon, 28 Aug 2017 12:32:38 +0000 (+0100) Subject: mhmisc.h: Add mhmisc.c's global variables as externs. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/d1cb0cfb62b6106108566a503969d401299c0cf2?ds=sidebyside;hp=836f8eb0eda25f31b82c07384fc9b1fb60ce7182 mhmisc.h: Add mhmisc.c's global variables as externs. Delete the local copies from other users. --- diff --git a/uip/mhlist.c b/uip/mhlist.c index 9fc42b0f..11dd59f2 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -50,14 +50,6 @@ DEFINE_SWITCH_ENUM(MHLIST); DEFINE_SWITCH_ARRAY(MHLIST, switches); #undef X - -/* mhmisc.c */ -extern int npart; -extern int ntype; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - /* mhparse.c */ extern char *preferred_types[]; extern char *preferred_subtypes[]; diff --git a/uip/mhmisc.h b/uip/mhmisc.h index bdf9baa5..60f532b7 100644 --- a/uip/mhmisc.h +++ b/uip/mhmisc.h @@ -12,3 +12,10 @@ int is_inline(CT) PURE; int make_intermediates(char *); void content_error(char *, CT, char *, ...) CHECK_PRINTF(3, 4); void flush_errors(void); + +extern int npart; +extern int ntype; +extern char *parts[NPARTS + 1]; +extern char *types[NTYPES + 1]; + +extern int userrs; diff --git a/uip/mhn.c b/uip/mhn.c index 1283a1ab..0223a42f 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -76,13 +76,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches); #undef X -/* mhmisc.c */ -extern int npart; -extern int ntype; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - int debugsw = 0; int verbosw = 0; diff --git a/uip/mhshow.c b/uip/mhshow.c index 5cc3b435..b3d3218c 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -67,13 +67,6 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches); #undef X -/* mhmisc.c */ -extern int npart; -extern int ntype; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - /* mhparse.c */ extern char *preferred_types[]; extern char *preferred_subtypes[]; diff --git a/uip/mhstore.c b/uip/mhstore.c index 850cabe0..37386405 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -47,13 +47,6 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches); #undef X -/* mhmisc.c */ -extern int npart; -extern int ntype; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - /* mhparse.c */ extern char *preferred_types[]; extern char *preferred_subtypes[];