X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhcachesbr.c;h=201ce514ab294df8f8ffdd9cea3159b540a15c90;hb=b3628819b4ab903269cd83cc68e453b13534346c;hp=c6f0603bcb3cbb861beaa89f21bb838c0fc4c9d9;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;p=mmh

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index c6f0603..201ce51 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -19,24 +19,14 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
 #endif
+#include <time.h>
 
 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;
@@ -50,7 +40,7 @@ char *cache_public;
 char *cache_private;
 
 
-/* mhparse.c (OR) mhbuildsbr.c */
+/* mhparse.c (OR) mhbuild.c */
 int pidcheck (int);
 
 /* mhmisc.c */
@@ -313,12 +303,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",