Cope with changed signature of http_timestring().

3 files changed, 2 insertions, 5 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c8cc7fa33..2935a26f50 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -653,6 +653,8 @@ typedef char fstring[FSTRING_LEN];
 #include "util_tdb.h"
 
 #include "../talloc/talloc.h"
+
+#include "../lib/util/time.h"
 /* And a little extension. Abort on type mismatch */
 #define talloc_get_type_abort(ptr, type) \
 	(type *)talloc_check_name_abort(ptr, #type)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index bf66908fd1..d4b9e67caa 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1127,11 +1127,9 @@ void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset);
 time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset);
 time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset);
 time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset);
-char *http_timestring(time_t t);
 char *timestring(TALLOC_CTX *mem_ctx, time_t t);
 const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt);
 NTTIME nttime_from_string(const char *s);
-int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2);
 struct timeval timeval_zero(void);
 bool timeval_is_zero(const struct timeval *tv);
 struct timeval timeval_current(void);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index ef98b5e1b5..5062529ade 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -174,9 +174,6 @@ typedef uint32 codepoint_t;
 /* pipe string names */
 #define PIPE_LANMAN   "\\PIPE\\LANMAN"
 
-/* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
-typedef uint64_t NTTIME;
-
 #define MAX_HOURS_LEN 32
 
 #ifndef MAXSUBAUTHS