Merge from metze of libreplace header changes

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 26e39ac603dc6974212158a93361724581ebbf61..3dc10db59fbe902ef7244d929d3753d35ec45bed 100644 (file)
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -91,19 +91,15 @@ char *rep_strdup(const char *s);
 void *rep_memmove(void *dest,const void *src,int size);
 #endif
 
-#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM)
-#include "system/time.h"
-#endif
-
 #ifndef HAVE_MKTIME
 #define mktime rep_mktime
-time_t rep_mktime(struct tm *t);
+/* prototype is in "system/time.h" */
 #endif
 
 #ifndef HAVE_TIMEGM
 struct tm;
 #define timegm rep_timegm
-time_t rep_timegm(struct tm *tm);
+/* prototype is in "system/time.h" */
 #endif
 
 #ifndef HAVE_STRLCPY

diff --git a/source/lib/replace/system/time.h b/source/lib/replace/system/time.h
index 6bbb6b15bb2999d20f45bd228f3e33423d45c7c3..036812ab8facfd841eded041d73526dc58294717 100644 (file)
--- a/source/lib/replace/system/time.h
+++ b/source/lib/replace/system/time.h
@@ -41,4 +41,14 @@
 #include <utime.h>
 #endif
 
+#ifndef HAVE_MKTIME
+/* define is in "replace.h" */
+time_t rep_mktime(struct tm *t);
+#endif
+
+#ifndef HAVE_TIMEGM
+/* define is in "replace.h" */
+time_t rep_timegm(struct tm *tm);
+#endif
+
 #endif