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/storage/bd/src/bd-aio.c | 5 ----- xlators/storage/bd/src/bd-aio.h | 5 ----- xlators/storage/bd/src/bd-helper.c | 4 ---- xlators/storage/bd/src/bd.c | 4 ---- xlators/storage/bd/src/bd.h | 5 ----- xlators/storage/posix/src/posix-aio.c | 5 ----- xlators/storage/posix/src/posix-aio.h | 5 ----- xlators/storage/posix/src/posix-handle.c | 5 ----- xlators/storage/posix/src/posix-handle.h | 5 ----- xlators/storage/posix/src/posix-helpers.c | 5 ----- xlators/storage/posix/src/posix.c | 5 ----- xlators/storage/posix/src/posix.h | 5 ----- 12 files changed, 58 deletions(-) (limited to 'xlators/storage') diff --git a/xlators/storage/bd/src/bd-aio.c b/xlators/storage/bd/src/bd-aio.c index 9dc13b3ec60..191d23d10b0 100644 --- a/xlators/storage/bd/src/bd-aio.c +++ b/xlators/storage/bd/src/bd-aio.c @@ -13,11 +13,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/storage/bd/src/bd-aio.h b/xlators/storage/bd/src/bd-aio.h index 16f686a4caa..82386e0b072 100644 --- a/xlators/storage/bd/src/bd-aio.h +++ b/xlators/storage/bd/src/bd-aio.h @@ -11,11 +11,6 @@ #ifndef _BD_AIO_H #define _BD_AIO_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c index 8aaffa6b27a..cf50ba5e7d9 100644 --- a/xlators/storage/bd/src/bd-helper.c +++ b/xlators/storage/bd/src/bd-helper.c @@ -1,7 +1,3 @@ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include #ifdef HAVE_LIBAIO #include diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c index 4ef94810f99..f732b85f030 100644 --- a/xlators/storage/bd/src/bd.c +++ b/xlators/storage/bd/src/bd.c @@ -17,10 +17,6 @@ cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif #include #include #include diff --git a/xlators/storage/bd/src/bd.h b/xlators/storage/bd/src/bd.h index 3491349f2e4..bdaf6f032d9 100644 --- a/xlators/storage/bd/src/bd.h +++ b/xlators/storage/bd/src/bd.h @@ -18,11 +18,6 @@ #ifndef _BD_H #define _BD_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #ifdef HAVE_LIBAIO #include #endif diff --git a/xlators/storage/posix/src/posix-aio.c b/xlators/storage/posix/src/posix-aio.c index c3bbddd6737..1818da6e34c 100644 --- a/xlators/storage/posix/src/posix-aio.c +++ b/xlators/storage/posix/src/posix-aio.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" #include "posix.h" diff --git a/xlators/storage/posix/src/posix-aio.h b/xlators/storage/posix/src/posix-aio.h index 5bde716019a..e9dd6467e5e 100644 --- a/xlators/storage/posix/src/posix-aio.h +++ b/xlators/storage/posix/src/posix-aio.h @@ -10,11 +10,6 @@ #ifndef _POSIX_AIO_H #define _POSIX_AIO_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include "xlator.h" #include "glusterfs.h" diff --git a/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c index 6182fd8a630..9ebb2069f96 100644 --- a/xlators/storage/posix/src/posix-handle.c +++ b/xlators/storage/posix/src/posix-handle.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include #include diff --git a/xlators/storage/posix/src/posix-handle.h b/xlators/storage/posix/src/posix-handle.h index e0b5b67e20f..d73ff9e655a 100644 --- a/xlators/storage/posix/src/posix-handle.h +++ b/xlators/storage/posix/src/posix-handle.h @@ -10,11 +10,6 @@ #ifndef _POSIX_HANDLE_H #define _POSIX_HANDLE_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include #include "xlator.h" diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 9018a739f83..4bfb9bbf29b 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define __XOPEN_SOURCE 500 #include diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index d38964143ba..ef0b3c0f59b 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -7,11 +7,6 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #define __XOPEN_SOURCE 500 #include diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h index d53a488ff6e..b85338e930e 100644 --- a/xlators/storage/posix/src/posix.h +++ b/xlators/storage/posix/src/posix.h @@ -10,11 +10,6 @@ #ifndef _POSIX_H #define _POSIX_H -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - #include #include #include -- cgit