diff options
author | Niels de Vos <ndevos@redhat.com> | 2015-05-18 16:26:02 +0200 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-29 05:43:17 -0700 |
commit | 8a9328e37b8c63d60583184dc8dab12f85810682 (patch) | |
tree | 0fa017379bf5e9dfaa2e6d8132c73cc1090a3d52 /xlators/encryption | |
parent | 5d912230a7d4f9979c10ff15da724624bd8e069d (diff) |
build: do not #include "config.h" in each file
Instead of including config.h in each file, and have the additional
config.h included from the compiler commandline (-include option).
When a .c file tests for a certain #define, and config.h was not
included, incorrect assumtions were made. With this change, it can not
happen again.
BUG: 1222319
Change-Id: I4f9097b8740b81ecfe8b218d52ca50361f74cb64
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10808
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators/encryption')
-rw-r--r-- | xlators/encryption/crypt/src/atom.c | 5 | ||||
-rw-r--r-- | xlators/encryption/crypt/src/crypt.c | 5 | ||||
-rw-r--r-- | xlators/encryption/crypt/src/crypt.h | 4 | ||||
-rw-r--r-- | xlators/encryption/crypt/src/data.c | 5 | ||||
-rw-r--r-- | xlators/encryption/crypt/src/keys.c | 5 | ||||
-rw-r--r-- | xlators/encryption/crypt/src/metadata.c | 5 | ||||
-rw-r--r-- | xlators/encryption/rot-13/src/rot-13.c | 5 | ||||
-rw-r--r-- | xlators/encryption/rot-13/src/rot-13.h | 5 |
8 files changed, 0 insertions, 39 deletions
diff --git a/xlators/encryption/crypt/src/atom.c b/xlators/encryption/crypt/src/atom.c index 1ec41495ca1..9b2d79c8eb4 100644 --- a/xlators/encryption/crypt/src/atom.c +++ b/xlators/encryption/crypt/src/atom.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 5387f84303c..4edd0aeb940 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -10,11 +10,6 @@ #include <ctype.h> #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h index 31bb59d8765..c1bfe3fcd0c 100644 --- a/xlators/encryption/crypt/src/crypt.h +++ b/xlators/encryption/crypt/src/crypt.h @@ -11,10 +11,6 @@ #ifndef __CRYPT_H__ #define __CRYPT_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include <openssl/aes.h> #include <openssl/evp.h> #include <openssl/sha.h> diff --git a/xlators/encryption/crypt/src/data.c b/xlators/encryption/crypt/src/data.c index 762fa554ac2..2f96ed2bab5 100644 --- a/xlators/encryption/crypt/src/data.c +++ b/xlators/encryption/crypt/src/data.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "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 4a1d3bb5a09..05f9e75362a 100644 --- a/xlators/encryption/crypt/src/keys.c +++ b/xlators/encryption/crypt/src/keys.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "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 a4124ab8d6b..f99890e13dd 100644 --- a/xlators/encryption/crypt/src/metadata.c +++ b/xlators/encryption/crypt/src/metadata.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "crypt-common.h" #include "crypt.h" diff --git a/xlators/encryption/rot-13/src/rot-13.c b/xlators/encryption/rot-13/src/rot-13.c index 1bcfe0192f6..6ec1b47c87b 100644 --- a/xlators/encryption/rot-13/src/rot-13.c +++ b/xlators/encryption/rot-13/src/rot-13.c @@ -10,11 +10,6 @@ #include <ctype.h> #include <sys/uio.h> -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glusterfs.h" #include "xlator.h" #include "logging.h" diff --git a/xlators/encryption/rot-13/src/rot-13.h b/xlators/encryption/rot-13/src/rot-13.h index 3e9fc19c776..a2017513437 100644 --- a/xlators/encryption/rot-13/src/rot-13.h +++ b/xlators/encryption/rot-13/src/rot-13.h @@ -10,11 +10,6 @@ #ifndef __ROT_13_H__ #define __ROT_13_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - typedef struct { gf_boolean_t encrypt_write; gf_boolean_t decrypt_read; |