Made the RPATHS config option the default and removed the #ifdefs.

[mmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 0b191f0..4a74bec 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -80,7 +80,7 @@ void m_unknown(FILE *);
 int makedir(char *);
 char *nmh_getpass(const char *);
 char *norm_charmap(char *);
-char *new_fs(char *, char *, char *);
+char *new_fs(char *, char *);
 int peekc(FILE *ib);
 int pidwait(pid_t, int);
 int pidstatus(int, FILE *, char *);
@@ -118,10 +118,7 @@ int unputenv(char *);
 int uprf(char *, char *);
 int vfgets(FILE *, char **);
 char *write_charset_8bit(void);
-
-#ifdef RPATHS
 int get_returnpath(char *, int, char *, int);
-#endif
 
 /*
 ** prototypes for compatibility functions in library
@@ -136,22 +133,19 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 
 
 /*
-** some prototypes for address parsing system
-** (others are in addrsbr.h)
-*/
-char *LocalName(void);
-char *SystemName(void);
-char *OfficialName(char *);
-
-/*
 ** prototypes for some routines in uip
 */
 int annotate(char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
 int distout(char *, char *, char *);
-void replout(FILE *, char *, char *, struct msgs *, int, int,
-               char *, char *, char *);
-int sendsbr(char **, int, char *, struct stat *, int, char *, int);
 int what_now(char *, int, int, char *, char *, int, struct msgs *,
-               char *, int, char *);
+               char *, char *);
+
+/*
+** from the former mts.h
+*/
+char *LocalName(void);  /* hostname */
+char *SystemName(void);
+char *getusername(void);
+char *getfullname(void);