From 81a70d4ac5c3143ff036d8f73979da70132e071e Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 10 Oct 2007 17:56:19 -0700
Subject: Merge from metze of libreplace header changes (This used to be commit
 d39ce8e37ed81f4a34a148f975874989d8d187a1)

---
 source3/lib/replace/replace.h     |  8 ++------
 source3/lib/replace/system/time.h | 10 ++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'source3/lib')

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
-- 
cgit