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 /extras | |
| parent | ad446dabb88439ba83e2092021b09894351e8e71 (diff) | |
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 'extras')
| -rw-r--r-- | extras/create_new_xlator/new-xlator-tmpl.c | 10 | ||||
| -rw-r--r-- | extras/geo-rep/gsync-sync-gfid.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/extras/create_new_xlator/new-xlator-tmpl.c b/extras/create_new_xlator/new-xlator-tmpl.c index caa10b374d1..9bb9aa6e4bc 100644 --- a/extras/create_new_xlator/new-xlator-tmpl.c +++ b/extras/create_new_xlator/new-xlator-tmpl.c @@ -113,9 +113,9 @@ xlator_api_t xlator_api = { #include "@XL_NAME@-mem-types.h" #include "@XL_NAME@-messages.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/xlator.h> +#include <glusterfs/defaults.h> #endif /* __@HFL_NAME@_H__ */ @@ -123,7 +123,7 @@ xlator_api_t xlator_api = { #ifndef __ @HFL_NAME @_H__ #define __ @HFL_NAME @_H__ -#include "mem-types.h" +#include <glusterfs/mem-types.h> enum gf_mdc_mem_types_ { gf_ @FOP_PREFIX @_mt_ = gf_common_mt_end + 1, @@ -136,7 +136,7 @@ enum gf_mdc_mem_types_ { #ifndef __ @HFL_NAME @_H__ #define __ @HFL_NAME @_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/extras/geo-rep/gsync-sync-gfid.c b/extras/geo-rep/gsync-sync-gfid.c index b0c5d31ba0b..47dca0413e9 100644 --- a/extras/geo-rep/gsync-sync-gfid.c +++ b/extras/geo-rep/gsync-sync-gfid.c @@ -7,8 +7,8 @@ #include <libgen.h> #include <ctype.h> #include <stdlib.h> -#include "glusterfs.h" -#include "syscall.h" +#include <glusterfs/glusterfs.h> +#include <glusterfs/syscall.h> #ifndef UUID_CANONICAL_FORM_LEN #define UUID_CANONICAL_FORM_LEN 36 |