summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/replace/replace.h8
-rw-r--r--source3/lib/replace/system/time.h10
2 files changed, 12 insertions, 6 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 26e39ac603..3dc10db59f 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/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/source3/lib/replace/system/time.h b/source3/lib/replace/system/time.h
index 6bbb6b15bb..036812ab8f 100644
--- a/source3/lib/replace/system/time.h
+++ b/source3/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