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 01c6a59..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 *);
+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
@@ -138,7 +135,7 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 /*
 ** prototypes for some routines in uip
 */
-int annotate(char *, char *, char *, int, int, int);
+int annotate(char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
 int distout(char *, char *, char *);