X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuild.c;h=5f29d0e617a2aee5ceb5985eb414ce60503df6fe;hp=06a353acf9b7d64157763d401877ee952b146d7c;hb=651d89ca77b0c62dec629b029ef8e25d0df1d4cb;hpb=0c648c7c1509760370d4c4267a45a5a305885e7f

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 06a353a..5f29d0e 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -25,16 +25,10 @@
 #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
+#include <time.h>
 
 static struct swit switches[] = {
 #define CHECKSW  0
@@ -2014,10 +2008,11 @@ calculate_digest(CT ct, int asciiP)
 	FILE *in;
 	MD5_CTX mdContext;
 	CE ce = ct->c_cefile;
+	char *infilename = ce->ce_file ? ce->ce_file : ct->c_file;
 
 	/* open content */
-	if ((in = fopen(ce->ce_file, "r")) == NULL)
-		adios(ce->ce_file, "unable to open for reading");
+	if ((in = fopen(infilename, "r")) == NULL)
+		adios (infilename, "unable to open for reading");
 
 	/* Initialize md5 context */
 	MD5Init(&mdContext);