Merge from HEAD.

(This used to be commit 1bba071126b46032c97154fbf77242e15bcc5fa3)

diff --git a/source3/tdb/tdbdump.c b/source3/tdb/tdbdump.c
index 9c1dc2761b67d9bb6af9879d798e4d6df89eb662..d2530f9f54cc168688f8f6f20f450fee8f1e104f 100644 (file)
--- a/source3/tdb/tdbdump.c
+++ b/source3/tdb/tdbdump.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <time.h>
-#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ctype.h>