From 8a9328e37b8c63d60583184dc8dab12f85810682 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 18 May 2015 16:26:02 +0200 Subject: 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 Reviewed-on: http://review.gluster.org/10808 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Pranith Kumar Karampuri --- xlators/nfs/server/src/acl3.c | 5 ----- xlators/nfs/server/src/mount3.c | 5 ----- xlators/nfs/server/src/mount3.h | 5 ----- xlators/nfs/server/src/nfs-common.c | 5 ----- xlators/nfs/server/src/nfs-common.h | 5 ----- xlators/nfs/server/src/nfs-fops.c | 5 ----- xlators/nfs/server/src/nfs-fops.h | 5 ----- xlators/nfs/server/src/nfs-generics.c | 5 ----- xlators/nfs/server/src/nfs-generics.h | 5 ----- xlators/nfs/server/src/nfs-inodes.c | 5 ----- xlators/nfs/server/src/nfs-inodes.h | 5 ----- xlators/nfs/server/src/nfs-messages.h | 5 ----- xlators/nfs/server/src/nfs.c | 5 ----- xlators/nfs/server/src/nfs.h | 5 ----- xlators/nfs/server/src/nfs3-fh.c | 5 ----- xlators/nfs/server/src/nfs3-fh.h | 5 ----- xlators/nfs/server/src/nfs3-helpers.c | 5 ----- xlators/nfs/server/src/nfs3-helpers.h | 5 ----- xlators/nfs/server/src/nfs3.c | 5 ----- xlators/nfs/server/src/nfs3.h | 5 ----- xlators/nfs/server/src/nlm4.c | 5 ----- xlators/nfs/server/src/nlm4.h | 5 ----- 22 files changed, 110 deletions(-) (limited to 'xlators/nfs') diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c index 21a92325b72..26fd7986534 100644 --- a/xlators/nfs/server/src/acl3.c +++ b/xlators/nfs/server/src/acl3.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 "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 8197cb1e7ca..b12d976bd21 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h index 026300e886f..18fcdd9a2a7 100644 --- a/xlators/nfs/server/src/mount3.h +++ b/xlators/nfs/server/src/mount3.h @@ -11,11 +11,6 @@ #ifndef _MOUNT3_H_ #define _MOUNT3_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index b6791566c2c..359835f2cbd 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h index 401484c0f3c..d60642f6039 100644 --- a/xlators/nfs/server/src/nfs-common.h +++ b/xlators/nfs/server/src/nfs-common.h @@ -11,11 +11,6 @@ #ifndef _NFS_COMMON_H_ #define _NFS_COMMON_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c index e5990a1e834..819ae98b081 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include diff --git a/xlators/nfs/server/src/nfs-fops.h b/xlators/nfs/server/src/nfs-fops.h index bd8cda18481..e511e8ac1de 100644 --- a/xlators/nfs/server/src/nfs-fops.h +++ b/xlators/nfs/server/src/nfs-fops.h @@ -11,11 +11,6 @@ #ifndef _NFS_FOPS_H_ #define _NFS_FOPS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "xlator.h" #include "iobuf.h" diff --git a/xlators/nfs/server/src/nfs-generics.c b/xlators/nfs/server/src/nfs-generics.c index cb32b7f1bab..ccfc0ae87c5 100644 --- a/xlators/nfs/server/src/nfs-generics.c +++ b/xlators/nfs/server/src/nfs-generics.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "string.h" diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h index 01876d68e2b..c3fb4fca339 100644 --- a/xlators/nfs/server/src/nfs-generics.h +++ b/xlators/nfs/server/src/nfs-generics.h @@ -11,11 +11,6 @@ #ifndef _NFS_GENERICS_H_ #define _NFS_GENERICS_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "nfs.h" #include "xlator.h" #include "nfs-fops.h" diff --git a/xlators/nfs/server/src/nfs-inodes.c b/xlators/nfs/server/src/nfs-inodes.c index 32c2f426ff4..0dad30ba10e 100644 --- a/xlators/nfs/server/src/nfs-inodes.c +++ b/xlators/nfs/server/src/nfs-inodes.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "string.h" #include "inode.h" diff --git a/xlators/nfs/server/src/nfs-inodes.h b/xlators/nfs/server/src/nfs-inodes.h index ba7a5712418..9ec94f2befe 100644 --- a/xlators/nfs/server/src/nfs-inodes.h +++ b/xlators/nfs/server/src/nfs-inodes.h @@ -11,11 +11,6 @@ #ifndef _NFS_INODES_H_ #define _NFS_INODES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "dict.h" #include "xlator.h" #include "iobuf.h" diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h index 77b85649c56..fe4a798b256 100644 --- a/xlators/nfs/server/src/nfs-messages.h +++ b/xlators/nfs/server/src/nfs-messages.h @@ -10,11 +10,6 @@ #ifndef _NFS_MESSAGES_H_ #define _NFS_MESSAGES_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "glfs-message-id.h" /*! \file nfs-messages.h diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c index 8b4bc75ea00..e057b17c3d6 100644 --- a/xlators/nfs/server/src/nfs.c +++ b/xlators/nfs/server/src/nfs.c @@ -13,11 +13,6 @@ */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "defaults.h" #include "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h index 15aec5d7da9..107140bc720 100644 --- a/xlators/nfs/server/src/nfs.h +++ b/xlators/nfs/server/src/nfs.h @@ -11,11 +11,6 @@ #ifndef __NFS_H__ #define __NFS_H__ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c index 7c9b92e4587..3feeae39dae 100644 --- a/xlators/nfs/server/src/nfs3-fh.c +++ b/xlators/nfs/server/src/nfs3-fh.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-fh.h b/xlators/nfs/server/src/nfs3-fh.h index eb969e44e22..3af36cc98b0 100644 --- a/xlators/nfs/server/src/nfs3-fh.h +++ b/xlators/nfs/server/src/nfs3-fh.h @@ -11,11 +11,6 @@ #ifndef _NFS_FH_H_ #define _NFS_FH_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "xdr-nfs3.h" #include "iatt.h" diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index 5bb34c138cf..42f4f68d3b0 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3-helpers.h b/xlators/nfs/server/src/nfs3-helpers.h index 626aa159d3a..2e358d4b016 100644 --- a/xlators/nfs/server/src/nfs3-helpers.h +++ b/xlators/nfs/server/src/nfs3-helpers.h @@ -10,11 +10,6 @@ #ifndef _NFS3_HELPER_H_ #define _NFS3_HELPER_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "nfs3.h" diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index d66ac5d00b5..a239d289d13 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -8,11 +8,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nfs3.h b/xlators/nfs/server/src/nfs3.h index f1b89fe17a8..b55cb848638 100644 --- a/xlators/nfs/server/src/nfs3.h +++ b/xlators/nfs/server/src/nfs3.h @@ -11,11 +11,6 @@ #ifndef _NFS3_H_ #define _NFS3_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "rpcsvc.h" #include "dict.h" #include "xlator.h" diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c index a1127a30695..7343fea8cd6 100644 --- a/xlators/nfs/server/src/nlm4.c +++ b/xlators/nfs/server/src/nlm4.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 "rpcsvc.h" #include "dict.h" diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h index 0ab03d8c575..c7da5d62193 100644 --- a/xlators/nfs/server/src/nlm4.h +++ b/xlators/nfs/server/src/nlm4.h @@ -11,11 +11,6 @@ #ifndef _NLM4_H_ #define _NLM4_H_ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include #include "rpcsvc.h" -- cgit