From 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Thu, 29 Nov 2018 14:08:06 -0500 Subject: libglusterfs: Move devel headers under glusterfs directory libglusterfs devel package headers are referenced in code using include semantics for a program, this while it works can be better especially when dealing with out of tree xlator builds or in general out of tree devel package usage. Towards this, the following changes are done, - moved all devel headers under a glusterfs directory - Included these headers using system header notation <> in all code outside of libglusterfs - Included these headers using own program notation "" within libglusterfs This change although big, is just moving around the headers and making it correct when including these headers from other sources. This helps us correctly include libglusterfs includes without namespace conflicts. Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b Updates: bz#1193929 Signed-off-by: ShyamsundarR --- xlators/mount/fuse/src/fuse-bridge.c | 12 ++++++------ xlators/mount/fuse/src/fuse-bridge.h | 20 ++++++++++---------- xlators/mount/fuse/src/fuse-mem-types.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'xlators/mount/fuse') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 412c8ea158f..0173046c3c3 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -10,12 +10,12 @@ #include #include "fuse-bridge.h" -#include "glusterfs.h" -#include "byte-order.h" -#include "compat-errno.h" -#include "glusterfs-acl.h" -#include "syscall.h" -#include "timespec.h" +#include +#include +#include +#include +#include +#include #ifdef __NetBSD__ #undef open /* in perfuse.h, pulled from mount-gluster-compat.h */ diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index b997d9e0cbb..57380786f17 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -19,12 +19,12 @@ #include #include -#include "glusterfs.h" -#include "logging.h" -#include "xlator.h" -#include "defaults.h" -#include "common-utils.h" -#include "statedump.h" +#include +#include +#include +#include +#include +#include #ifdef GF_DARWIN_HOST_OS #include "fuse_kernel_macfuse.h" @@ -35,10 +35,10 @@ #include "fuse-mount.h" #include "fuse-mem-types.h" -#include "list.h" -#include "dict.h" -#include "syncop.h" -#include "gidcache.h" +#include +#include +#include +#include #if defined(GF_LINUX_HOST_OS) || defined(__FreeBSD__) || defined(__NetBSD__) #define FUSE_OP_HIGH (FUSE_LSEEK + 1) diff --git a/xlators/mount/fuse/src/fuse-mem-types.h b/xlators/mount/fuse/src/fuse-mem-types.h index c3c0028473a..4fd8e58c523 100644 --- a/xlators/mount/fuse/src/fuse-mem-types.h +++ b/xlators/mount/fuse/src/fuse-mem-types.h @@ -11,7 +11,7 @@ #ifndef __FUSE_MEM_TYPES_H__ #define __FUSE_MEM_TYPES_H__ -#include "mem-types.h" +#include enum gf_fuse_mem_types_ { gf_fuse_mt_iovec = gf_common_mt_end + 1, -- cgit