Remove OS-specific defines. Remove GECOS ampersand-magic, along with it.

[mmh] / uip / mhcachesbr.c

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 13ab153..2d6c596 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -31,13 +30,9 @@
 # endif
 #endif
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 extern int debugsw;
 
-extern pid_t xpid;  /* mhshowsbr.c or mhbuildsbr.c */
+extern pid_t xpid;  /* mhshowsbr.c or mhbuild.c */
 
 /* cache policies */
 int rcachesw = CACHE_ASK;
@@ -51,7 +46,7 @@ char *cache_public;
 char *cache_private;
 
 
-/* mhparse.c (OR) mhbuildsbr.c */
+/* mhparse.c (OR) mhbuild.c */
 int pidcheck (int);
 
 /* mhmisc.c */
@@ -314,12 +309,7 @@ find_cache_aux(int writing, char *directory, char *id, char *buffer,
        FILE *fp;
        static int partno, pid;
        static time_t clock = 0;
-
-#ifdef BSD42
-       usemap = strchr(id, '/') ? 1 : 0;
-#else
        usemap = 1;
-#endif
 
        if (debugsw)
                fprintf(stderr, "find_cache_aux %s usemap=%d\n",