r5330: Remove #include <sys/time.h> from includes.h.

Add #include "system/time.h" back (it was removed in some of these
places because the definitions were provided by <sys/time.h> on tridge's
platform.)

Andrew Bartlett
(This used to be commit 34b1da730304bed7fee5bae7cbde7fbccecb6af5)

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 2e04e365ebe1ac291fa958296789b4b526edbad2..8675ad0ba6ebef2c0b7a598bdbc9efffdc5bd27e 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -51,7 +51,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <sys/time.h>
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>

diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 67630d445839757b064418f5dd06b3c089abf469..a166447aae0a34d6e185c09386717077e9da94d1 100644 (file)
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -38,6 +38,7 @@
 
 #ifdef _SAMBA_BUILD_
 #include "system/filesys.h"
+#include "system/time.h"
 #endif
 
 static const char *ldb_url;

diff --git a/source4/lib/tdb/tools/tdbtest.c b/source4/lib/tdb/tools/tdbtest.c
index e55d08f840543c83f0952512c6fcaf709499d55a..4f7f7faafc8615b3154d5df9c590848cdfa02c6d 100644 (file)
--- a/source4/lib/tdb/tools/tdbtest.c
+++ b/source4/lib/tdb/tools/tdbtest.c
@@ -17,6 +17,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "system/time.h"
 #include "lib/tdb/include/tdb.h"
 
 #endif

diff --git a/source4/libcli/auth/clikrb5.c b/source4/libcli/auth/clikrb5.c
index f2536663f4b3124d149dad6864c2a389a32cf8b4..5a196db7a5433477bdbcaf9e82a4b7879560fc64 100644 (file)
--- a/source4/libcli/auth/clikrb5.c
+++ b/source4/libcli/auth/clikrb5.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/kerberos.h"
+#include "system/time.h"
 #include "libcli/auth/kerberos.h"
 
 #ifdef HAVE_KRB5

diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index 1fc33d364488f774aa8b59e0bfb112f1df0312dd..a0c2a77f4b2dbf4a2a60e0e99ae06e10df6801e2 100644 (file)
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
+#include "system/time.h"
 #include "libcli/auth/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "auth/auth.h"

diff --git a/source4/libcli/auth/kerberos.c b/source4/libcli/auth/kerberos.c
index 186da0fcf4ec1600a778a13d54aeb1bd6dfb626f..45838c681829cd914ee704ce913f7efff319a4a7 100644 (file)
--- a/source4/libcli/auth/kerberos.c
+++ b/source4/libcli/auth/kerberos.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/kerberos.h"
+#include "system/time.h"
 #include "libcli/auth/kerberos.h"
 #include "secrets.h"
 #include "pstring.h"