From 33dc8211a72df0c27fa11220f3b27583cd1c7e49 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 8 Feb 2012 18:38:54 +0100 Subject: [PATCH] Merged h/mts.h into h/prototypes.h. Note: spost.c is not up to date. --- h/Makefile.in | 2 +- h/mts.h | 12 ------------ h/prototypes.h | 8 ++++++++ sbr/addrsbr.c | 1 - sbr/m_getfld.c | 1 - sbr/mts.c | 1 - uip/ali.c | 1 - uip/ap.c | 1 - uip/conflict.c | 1 - uip/dropsbr.c | 1 - uip/inc.c | 1 - uip/mhbuild.c | 1 - uip/mhbuildsbr.c | 1 - uip/mhcachesbr.c | 1 - uip/mhlist.c | 1 - uip/mhlistsbr.c | 1 - uip/mhoutsbr.c | 1 - uip/mhparse.c | 1 - uip/mhshow.c | 1 - uip/mhshowsbr.c | 1 - uip/mhstore.c | 1 - uip/mhstoresbr.c | 1 - uip/mhtest.c | 1 - uip/msgchk.c | 1 - uip/rcvdist.c | 1 - uip/rcvpack.c | 1 - uip/rcvstore.c | 1 - uip/rcvtty.c | 1 - uip/scan.c | 1 - uip/slocal.c | 1 - 30 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 h/mts.h diff --git a/h/Makefile.in b/h/Makefile.in index dbf540ec..a2c40610 100644 --- a/h/Makefile.in +++ b/h/Makefile.in @@ -9,7 +9,7 @@ VPATH = @srcdir@ # header files included in distribution HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h \ - fmt_scan.h md5.h mf.h mh.h mhcachesbr.h mhparse.h mime.h mts.h \ + fmt_scan.h md5.h mf.h mh.h mhcachesbr.h mhparse.h mime.h \ netdb.h nmh.h picksbr.h popsbr.h prototypes.h rcvmail.h \ scansbr.h signals.h tws.h utils.h diff --git a/h/mts.h b/h/mts.h deleted file mode 100644 index 2155e055..00000000 --- a/h/mts.h +++ /dev/null @@ -1,12 +0,0 @@ -/* -** mts.h -- definitions for the mail system -*/ - -/* -** Local and UUCP Host Name -*/ -char *LocalName(void); -char *SystemName(void); - -char *getusername(void); -char *getfullname(void); diff --git a/h/prototypes.h b/h/prototypes.h index 9425b6d4..4d93d9b3 100644 --- a/h/prototypes.h +++ b/h/prototypes.h @@ -154,3 +154,11 @@ void replout(FILE *, char *, char *, struct msgs *, int, char *, char *, char *); int what_now(char *, int, int, char *, char *, int, struct msgs *, char *, int, char *); + +/* +** from the former mts.h +*/ +char *LocalName(void); /* hostname */ +char *SystemName(void); +char *getusername(void); +char *getfullname(void); diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index 4059ce00..c1e937f0 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -466,7 +466,6 @@ local_test: ; ** everything is a valid host, and let SendMail worry about it. */ -#include #include diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index 4dbd94fd..d64457f3 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -7,7 +7,6 @@ */ #include -#include #include /* diff --git a/sbr/mts.c b/sbr/mts.c index f43b15de..dd193bc4 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/uip/ali.c b/uip/ali.c index f1d74163..df29930c 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -9,7 +9,6 @@ #include #include #include -#include #include /* diff --git a/uip/ap.c b/uip/ap.c index 4f7f7603..e444cd89 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -9,7 +9,6 @@ #include #include #include -#include #define NADDRS 100 diff --git a/uip/conflict.c b/uip/conflict.c index 03de873a..0d9c78c4 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/dropsbr.c b/uip/dropsbr.c index dd7a2df5..62ba424e 100644 --- a/uip/dropsbr.c +++ b/uip/dropsbr.c @@ -11,7 +11,6 @@ #include #include -#include #include #ifdef HAVE_ERRNO_H diff --git a/uip/inc.c b/uip/inc.c index 1f03e2b7..587bd846 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/uip/mhbuild.c b/uip/mhbuild.c index 734d8ab2..63d7be2f 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 43586062..069ea85f 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index 13ab1534..c6f0603b 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhlist.c b/uip/mhlist.c index 12480cf7..8902f759 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c index e11cf5dc..4c788d16 100644 --- a/uip/mhlistsbr.c +++ b/uip/mhlistsbr.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index 939275f6..00b538ca 100644 --- a/uip/mhoutsbr.c +++ b/uip/mhoutsbr.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhparse.c b/uip/mhparse.c index d2f69bc6..86c16a9a 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhshow.c b/uip/mhshow.c index 1f37c0e8..bf5ef8bb 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index b7452d8a..e302d3bd 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhstore.c b/uip/mhstore.c index 2167a3fe..c1a3edbe 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 0b1a9b30..aa95dd8a 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/mhtest.c b/uip/mhtest.c index 0cfce9f8..7dc9c07d 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/uip/msgchk.c b/uip/msgchk.c index 5e10ad33..932da206 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -7,7 +7,6 @@ */ #include -#include #include #include diff --git a/uip/rcvdist.c b/uip/rcvdist.c index cff337db..338455f9 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -10,7 +10,6 @@ #include #include #include -#include #include static struct swit switches[] = { diff --git a/uip/rcvpack.c b/uip/rcvpack.c index f0f1bd18..d6e10257 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -10,7 +10,6 @@ #include #include #include -#include static struct swit switches[] = { #define VERSIONSW 0 diff --git a/uip/rcvstore.c b/uip/rcvstore.c index ebf3e14d..04b62d85 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -11,7 +11,6 @@ #include #include #include -#include static struct swit switches[] = { #define CRETSW 0 diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 1dc38c4e..ecdbbcfb 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/uip/scan.c b/uip/scan.c index 18de4c48..d228c717 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/uip/slocal.c b/uip/slocal.c index 0ef54c6f..fe1977fa 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include -- 2.39.5