summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-09-22 19:21:42 +1000
committerJeremy Allison <jra@samba.org>2014-10-04 00:11:20 +0200
commit2d7dfe3d68c39f11afdece3281f9fbca0b48fb3f (patch)
tree3af593511742609e806ceef16dddabae261ab7ec
parent3d6675fd1ee32ba0795f7f09f42a1b005ba5e621 (diff)
downloadsamba-2d7dfe3d68c39f11afdece3281f9fbca0b48fb3f.tar.gz
samba-2d7dfe3d68c39f11afdece3281f9fbca0b48fb3f.tar.xz
samba-2d7dfe3d68c39f11afdece3281f9fbca0b48fb3f.zip
lib/util: Clean up includes for xfile.[ch]
The include files added to xfile.h are already included unconditionally elsewhere (replace.h, samba_util.h, ...) so Samba can't be built without them. To minimise dependencies, only include specific util headers instead of samba_util.h. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/util/xfile.c3
-rw-r--r--lib/util/xfile.h6
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 58a34bf1c3..62dd1213a7 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -35,7 +35,8 @@
#include "replace.h"
#include "system/filesys.h"
-#include "lib/util/samba_util.h"
+#include "memory.h"
+#include "xfile.h"
#define XBUFSIZE BUFSIZ
diff --git a/lib/util/xfile.h b/lib/util/xfile.h
index 1b15929997..f52596dc8a 100644
--- a/lib/util/xfile.h
+++ b/lib/util/xfile.h
@@ -19,6 +19,12 @@
#ifndef _XFILE_H_
#define _XFILE_H_
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include "attr.h"
+
/*
see xfile.c for explanations
*/