[PATCH] Avoid an includes.h reference

Volker Lendecke vl at samba.org
Wed Nov 16 16:19:01 UTC 2016


Hi!

It would be great if we could avoid includes.h in lib/util. We have
two of those, which might cause confusion.

Review appreciated!

Thanks, Volker
-------------- next part --------------
>From bdcccd6a92707fa5c96a5937be5d4126b74c519b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 16 Nov 2016 16:13:12 +0000
Subject: [PATCH 1/2] lib: memcache.h needs some includes

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/util/memcache.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/util/memcache.h b/lib/util/memcache.h
index 2602fb7..b87746b 100644
--- a/lib/util/memcache.h
+++ b/lib/util/memcache.h
@@ -20,6 +20,9 @@
 #ifndef __MEMCACHE_H__
 #define __MEMCACHE_H__
 
+#include <talloc.h>
+#include "lib/util/data_blob.h"
+
 struct memcache;
 
 /*
-- 
2.1.4


>From aac621bcba1b8315f399ec0e706d2cb98adcc32f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Wed, 16 Nov 2016 16:15:27 +0000
Subject: [PATCH 2/2] lib: Avoid includes.h in access.c

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 lib/util/access.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/util/access.c b/lib/util/access.c
index 859824c..6d04a5f 100644
--- a/lib/util/access.c
+++ b/lib/util/access.c
@@ -10,7 +10,9 @@
    Updated for IPv6 by Jeremy Allison (C) 2007.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "system/locale.h"
+#include "lib/util/debug.h"
 #include "../lib/util/memcache.h"
 #include "lib/socket/interfaces.h"
 #include "lib/util/samba_util.h"
-- 
2.1.4



More information about the samba-technical mailing list