From 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 Mon Sep 17 00:00:00 2001
From: ShyamsundarR <srangana@redhat.com>
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 <srangana@redhat.com>
---
 xlators/performance/decompounder/src/decompounder-mem-types.h | 2 +-
 xlators/performance/decompounder/src/decompounder-messages.h  | 2 +-
 xlators/performance/decompounder/src/decompounder.c           | 4 ++--
 xlators/performance/decompounder/src/decompounder.h           | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xlators/performance/decompounder')

diff --git a/xlators/performance/decompounder/src/decompounder-mem-types.h b/xlators/performance/decompounder/src/decompounder-mem-types.h
index 8b3049ffb18..1a31f7c892c 100644
--- a/xlators/performance/decompounder/src/decompounder-mem-types.h
+++ b/xlators/performance/decompounder/src/decompounder-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __DC_MEM_TYPES_H__
 #define __DC_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_dc_mem_types_ { gf_dc_mt_rsp_t = gf_common_mt_end + 1, gf_dc_mt_end };
 #endif
diff --git a/xlators/performance/decompounder/src/decompounder-messages.h b/xlators/performance/decompounder/src/decompounder-messages.h
index 60674f32e78..a93af5d69e4 100644
--- a/xlators/performance/decompounder/src/decompounder-messages.h
+++ b/xlators/performance/decompounder/src/decompounder-messages.h
@@ -11,7 +11,7 @@
 #ifndef _DC_MESSAGES_H_
 #define _DC_MESSAGES_H_
 
-#include "glfs-message-id.h"
+#include <glusterfs/glfs-message-id.h>
 
 /* To add new message IDs, append new identifiers at the end of the list.
  *
diff --git a/xlators/performance/decompounder/src/decompounder.c b/xlators/performance/decompounder/src/decompounder.c
index 8bc390923e0..6fb7f534e3f 100644
--- a/xlators/performance/decompounder/src/decompounder.c
+++ b/xlators/performance/decompounder/src/decompounder.c
@@ -9,8 +9,8 @@
 */
 
 #include "decompounder.h"
-#include "mem-types.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/mem-types.h>
+#include <glusterfs/compound-fop-utils.h>
 
 void
 dc_local_cleanup(dc_local_t *local)
diff --git a/xlators/performance/decompounder/src/decompounder.h b/xlators/performance/decompounder/src/decompounder.h
index 486d0caf369..b9b934d5112 100644
--- a/xlators/performance/decompounder/src/decompounder.h
+++ b/xlators/performance/decompounder/src/decompounder.h
@@ -11,9 +11,9 @@
 #ifndef __DC_H__
 #define __DC_H__
 
-#include "defaults.h"
-#include "xlator.h"
-#include "call-stub.h"
+#include <glusterfs/defaults.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/call-stub.h>
 #include "decompounder-mem-types.h"
 #include "decompounder-messages.h"
 
-- 
cgit