diff options
| author | ShyamsundarR <srangana@redhat.com> | 2018-11-29 14:08:06 -0500 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-12-05 21:47:04 +0000 |
| commit | 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 (patch) | |
| tree | f2e6af0f2ba7768e32cbf712149c0ffd5314f811 /xlators/features/trash/src | |
| parent | ad446dabb88439ba83e2092021b09894351e8e71 (diff) | |
| download | glusterfs-20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5.tar.gz glusterfs-20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5.tar.xz glusterfs-20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5.zip | |
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>
Diffstat (limited to 'xlators/features/trash/src')
| -rw-r--r-- | xlators/features/trash/src/trash-mem-types.h | 2 | ||||
| -rw-r--r-- | xlators/features/trash/src/trash.c | 2 | ||||
| -rw-r--r-- | xlators/features/trash/src/trash.h | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xlators/features/trash/src/trash-mem-types.h b/xlators/features/trash/src/trash-mem-types.h index 133f2edf99..43353c8f09 100644 --- a/xlators/features/trash/src/trash-mem-types.h +++ b/xlators/features/trash/src/trash-mem-types.h @@ -10,7 +10,7 @@ #ifndef __TRASH_MEM_TYPES_H__ #define __TRASH_MEM_TYPES_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_trash_mem_types_ { gf_trash_mt_trash_private_t = gf_common_mt_end + 1, diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index aa546d3394..51dc6fac7a 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -9,7 +9,7 @@ */ #include "trash.h" #include "trash-mem-types.h" -#include "syscall.h" +#include <glusterfs/syscall.h> #define root_gfid \ (uuid_t) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h index 675f9f9735..6671617c2c 100644 --- a/xlators/features/trash/src/trash.h +++ b/xlators/features/trash/src/trash.h @@ -10,11 +10,11 @@ #ifndef __TRASH_H__ #define __TRASH_H__ -#include "glusterfs.h" -#include "logging.h" -#include "dict.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/logging.h> +#include <glusterfs/dict.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #include "inode.c" #include "fnmatch.h" |