From 0a6fe8551ac9807a8b6ad62241ec8048cf9f9025 Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Sun, 9 Jun 2019 13:31:31 +0300 Subject: multiple files: another attempt to remove includes There are many include statements that are not needed. A previous more ambitious attempt failed because of *BSD plafrom (see https://review.gluster.org/#/c/glusterfs/+/21929/ ) Now trying a more conservative reduction. It does not solve all circular deps that we have, but it does reduce some of them. There is just too much to handle reasonably (dht-common.h includes dht-lock.h which includes dht-common.h ...), but it does reduce the overall number of lines of include we need to look at in the future to understand and fix the mess later one. Change-Id: I550cd001bdefb8be0fe67632f783c0ef6bee3f9f updates: bz#1193929 Signed-off-by: Yaniv Kaul --- xlators/lib/src/libxlator.c | 2 +- xlators/lib/src/libxlator.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'xlators/lib/src') diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index 724ceef5f2a..8075fa0c29f 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.c @@ -7,7 +7,7 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include + #include "libxlator.h" int marker_xtime_default_gauge[] = { diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h index d17a1e21891..81da4060d55 100644 --- a/xlators/lib/src/libxlator.h +++ b/xlators/lib/src/libxlator.h @@ -10,10 +10,12 @@ #ifndef _LIBXLATOR_H #define _LIBXLATOR_H -#include -#include #include -#include + +#include // for int32_t +#include "glusterfs/dict.h" // for dict_t, data_t +#include "glusterfs/globals.h" // for xlator_t, loc_t +#include "glusterfs/stack.h" // for call_frame_t #include #include -- cgit