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/encryption/crypt/src/atom.c            | 2 +-
 xlators/encryption/crypt/src/crypt-mem-types.h | 2 +-
 xlators/encryption/crypt/src/crypt.c           | 8 ++++----
 xlators/encryption/crypt/src/crypt.h           | 2 +-
 xlators/encryption/crypt/src/data.c            | 2 +-
 xlators/encryption/crypt/src/keys.c            | 2 +-
 xlators/encryption/crypt/src/metadata.c        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'xlators/encryption/crypt')

diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c
index 8e9c4940abd..bdc37c500a3 100644
--- a/xlators/encryption/crypt/src/atom.c
+++ b/xlators/encryption/crypt/src/atom.c
@@ -8,7 +8,7 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "crypt-common.h"
 #include "crypt.h"
 
diff --git a/xlators/encryption/crypt/src/crypt-mem-types.h b/xlators/encryption/crypt/src/crypt-mem-types.h
index 7e9fb90ed43..e756ea4a23c 100644
--- a/xlators/encryption/crypt/src/crypt-mem-types.h
+++ b/xlators/encryption/crypt/src/crypt-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __CRYPT_MEM_TYPES_H__
 #define __CRYPT_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_crypt_mem_types_ {
     gf_crypt_mt_priv = gf_common_mt_end + 1,
diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c
index 02c4028c087..02253642cc9 100644
--- a/xlators/encryption/crypt/src/crypt.c
+++ b/xlators/encryption/crypt/src/crypt.c
@@ -10,10 +10,10 @@
 #include <ctype.h>
 #include <sys/uio.h>
 
-#include "glusterfs.h"
-#include "xlator.h"
-#include "logging.h"
-#include "defaults.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/defaults.h>
 
 #include "crypt-common.h"
 #include "crypt.h"
diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h
index 390eee831b1..c1216a2cdb0 100644
--- a/xlators/encryption/crypt/src/crypt.h
+++ b/xlators/encryption/crypt/src/crypt.h
@@ -18,7 +18,7 @@
 #include <openssl/cmac.h>
 #include <openssl/modes.h>
 #include "crypt-mem-types.h"
-#include "compat.h"
+#include <glusterfs/compat.h>
 
 #define CRYPT_XLATOR_ID (0)
 
diff --git a/xlators/encryption/crypt/src/data.c b/xlators/encryption/crypt/src/data.c
index 8e8701b6bf2..93288b1a414 100644
--- a/xlators/encryption/crypt/src/data.c
+++ b/xlators/encryption/crypt/src/data.c
@@ -8,7 +8,7 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "crypt-common.h"
 #include "crypt.h"
 
diff --git a/xlators/encryption/crypt/src/keys.c b/xlators/encryption/crypt/src/keys.c
index a9357005a36..92a4d471f58 100644
--- a/xlators/encryption/crypt/src/keys.c
+++ b/xlators/encryption/crypt/src/keys.c
@@ -8,7 +8,7 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "crypt-common.h"
 #include "crypt.h"
 
diff --git a/xlators/encryption/crypt/src/metadata.c b/xlators/encryption/crypt/src/metadata.c
index 90c53a9f721..120ae62f777 100644
--- a/xlators/encryption/crypt/src/metadata.c
+++ b/xlators/encryption/crypt/src/metadata.c
@@ -8,7 +8,7 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "crypt-common.h"
 #include "crypt.h"
 #include "metadata.h"
-- 
cgit