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>

api/src/gfapi-messages.h

@@ -11,11 +11,6 @@
 #ifndef _GFAPI_MESSAGES_H__
 #define _GFAPI_MESSAGES_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glfs-message-id.h"
 
 /*! \file gfapi-messages.h

api/src/glfs-master.c

@@ -15,11 +15,6 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include "glusterfs.h"
 

api/src/glfs-mgmt.c

@@ -16,11 +16,6 @@
 #include <signal.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* _CONFIG_H */
-
 #include "glusterfs.h"
 #include "glfs.h"
 #include "stack.h"

api/src/glfs-resolve.c

@@ -16,11 +16,6 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "logging.h"
 #include "stack.h"

api/src/glfs.c

@@ -33,11 +33,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "logging.h"
 #include "stack.h"

cli/src/cli-cmd-global.c

@@ -19,11 +19,6 @@
 #include <sys/wait.h>
 #include <netinet/in.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd-misc.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd-parser.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd-peer.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd-snapshot.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 

cli/src/cli-cmd-system.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd-volume.c

@@ -19,11 +19,6 @@
 #include <sys/wait.h>
 #include <netinet/in.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-cmd.h

@@ -10,11 +10,6 @@
 #ifndef __CLI_CMD_H__
 #define __CLI_CMD_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <netdb.h>
 
 #include "cli.h"

cli/src/cli-quotad-client.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 "cli-quotad-client.h"
 

cli/src/cli-rl.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"

cli/src/cli-rpc-ops.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 /* Widths of various columns in top read/write-perf output
  * Total width of top read/write-perf should be 80 chars
  * including one space between column

cli/src/cli.c

@@ -29,11 +29,6 @@
 #include <semaphore.h>
 #include <errno.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif

cli/src/cli.h

@@ -10,11 +10,6 @@
 #ifndef __CLI_H__
 #define __CLI_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpc-clnt.h"
 #include "glusterfs.h"
 #include "protocol-common.h"

cli/src/input.c

@@ -13,11 +13,6 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "cli.h"
 #include "cli-mem-types.h"
 

cli/src/registry.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

configure.ac

@@ -1257,7 +1257,7 @@ CONTRIBDIR='$(top_srcdir)/contrib'
 AC_SUBST(CONTRIBDIR)
 
 GF_CPPDEFINES='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)'
-GF_CPPINCLUDES='-I$(top_srcdir)/libglusterfs/src'
+GF_CPPINCLUDES='-include $(top_builddir)/config.h -I$(top_srcdir)/libglusterfs/src'
 GF_CPPFLAGS="$GF_CPPFLAGS $GF_CPPDEFINES $GF_CPPINCLUDES"
 AC_SUBST([GF_CPPFLAGS])
 

geo-replication/src/gsyncd.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

geo-replication/src/procdiggy.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

glusterfsd/src/glusterfsd-messages.h

@@ -11,11 +11,6 @@
 #ifndef _GLUSTERFSD_MESSAGES_H_
 #define _GLUSTERFSD_MESSAGES_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glfs-message-id.h"
 
 /* NOTE: Rules for message additions

glusterfsd/src/glusterfsd-mgmt.c

@@ -13,11 +13,6 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* _CONFIG_H */
-
 #include "glusterfs.h"
 #include "stack.h"
 #include "dict.h"

glusterfsd/src/glusterfsd.c

@@ -32,11 +32,6 @@
 #include <errno.h>
 #include <pwd.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif

glusterfsd/src/glusterfsd.h

@@ -10,10 +10,6 @@
 #ifndef __GLUSTERFSD_H__
 #define __GLUSTERFSD_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
 #include "rpcsvc.h"
 #include "glusterd1-xdr.h"
 

libglusterfs/src/call-stub.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <openssl/md5.h>
 #include <inttypes.h>
 

libglusterfs/src/call-stub.h

@@ -11,11 +11,6 @@
 #ifndef _CALL_STUB_H_
 #define _CALL_STUB_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include "defaults.h"
 #include "stack.h"

libglusterfs/src/client_t.c

@@ -16,11 +16,6 @@
 #include "rpcsvc.h"
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 static int
 gf_client_chain_client_entries (cliententry_t *entries, uint32_t startidx,
                         uint32_t endcount)

libglusterfs/src/client_t.h

@@ -11,11 +11,6 @@
 #ifndef _CLIENT_T_H
 #define _CLIENT_T_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "locking.h"  /* for gf_lock_t, not included by glusterfs.h */
 

libglusterfs/src/cluster-syncop.h

@@ -12,11 +12,6 @@
 #ifndef _CLUSTER_SYNCOP_H
 #define _CLUSTER_SYNCOP_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <sys/time.h>
 #include <pthread.h>

libglusterfs/src/common-utils.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 #else

libglusterfs/src/common-utils.h

@@ -11,11 +11,6 @@
 #ifndef _COMMON_UTILS_H
 #define _COMMON_UTILS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <sys/uio.h>
 #include <netdb.h>

libglusterfs/src/compat-errno.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 
 #include "compat-errno.h"

libglusterfs/src/compat-errno.h

@@ -11,11 +11,6 @@
 #ifndef __COMPAT_ERRNO_H__
 #define __COMPAT_ERRNO_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <errno.h>
 
 #define GF_ERROR_CODE_SUCCESS         0

libglusterfs/src/compat.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 <stdlib.h>
 #include <unistd.h>

libglusterfs/src/compat.h

@@ -11,11 +11,6 @@
 #ifndef __COMPAT_H__
 #define __COMPAT_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include "dict.h"
 

libglusterfs/src/ctx.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* !_CONFIG_H */
-
 #include <pthread.h>
 #include "globals.h"
 

libglusterfs/src/daemon.h

@@ -11,11 +11,6 @@
 #ifndef _DAEMON_H
 #define _DAEMON_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define DEVNULLPATH "/dev/null"
 
 int os_daemon_return(int nochdir, int noclose);

libglusterfs/src/defaults.c

@@ -20,11 +20,6 @@
    All the functions are plain enough to understand.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include "defaults.h"
 

libglusterfs/src/defaults.h

@@ -15,11 +15,6 @@
 #ifndef _DEFAULTS_H
 #define _DEFAULTS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 
 typedef struct {

libglusterfs/src/dict.c

@@ -16,11 +16,6 @@
 #include <limits.h>
 #include <fnmatch.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "common-utils.h"
 #include "dict.h"

libglusterfs/src/dict.h

@@ -11,11 +11,6 @@
 #ifndef _DICT_H
 #define _DICT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <sys/uio.h>
 #include <pthread.h>

libglusterfs/src/event-epoll.c

@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 #ifdef HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>

libglusterfs/src/event-history.h

@@ -11,11 +11,6 @@
 #ifndef _EH_H
 #define _EH_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "mem-types.h"
 #include "circ-buff.h"
 

libglusterfs/src/event-poll.c

@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 
 struct event_slot_poll {

libglusterfs/src/event.c

@@ -21,11 +21,6 @@
 #include "mem-pool.h"
 #include "common-utils.h"
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 
 struct event_pool *

libglusterfs/src/event.h

@@ -11,11 +11,6 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <pthread.h>
 
 struct event_pool;

libglusterfs/src/fd.c

@@ -15,11 +15,6 @@
 #include "statedump.h"
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 static int
 gf_fd_fdtable_expand (fdtable_t *fdtable, uint32_t nr);

libglusterfs/src/fd.h

@@ -11,11 +11,6 @@
 #ifndef _FD_H
 #define _FD_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "list.h"
 #include <sys/types.h>
 #include <unistd.h>

libglusterfs/src/gf-dirent.c

@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 #include <stdio.h>
 #include <string.h>

libglusterfs/src/gf-dirent.h

@@ -12,11 +12,6 @@
 #ifndef _GF_DIRENT_H
 #define _GF_DIRENT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "iatt.h"
 #include "inode.h"
 

libglusterfs/src/gfdb/gfdb_data_store.h

@@ -11,11 +11,6 @@
 #define __GFDB_DATA_STORE_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "xlator.h"
 #include "logging.h"

libglusterfs/src/gfdb/gfdb_data_store_types.h

@@ -11,11 +11,6 @@
 #define __GFDB_DATA_STORE_TYPE_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <time.h>
 #include <sys/time.h>
 #include <string.h>

libglusterfs/src/gfdb/gfdb_sqlite3.h

@@ -11,11 +11,6 @@
 #define __GFDB_SQLITE3_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 /*Sqlite3 header file*/
 #include <sqlite3.h>
 

libglusterfs/src/gfdb/gfdb_sqlite3_helper.h

@@ -11,11 +11,6 @@
 #define __GFDB_SQLITE3_HELPER_H
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "gfdb_sqlite3.h"
 
 /******************************************************************************

libglusterfs/src/glfs-message-id.h

@@ -11,11 +11,6 @@
 #ifndef _GLFS_MESSAGE_ID_H_
 #define _GLFS_MESSAGE_ID_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 /* Base of all message IDs, all message IDs would be
  * greater than this */
 #define GLFS_MSGID_BASE         100000

libglusterfs/src/globals.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif /* !_CONFIG_H */
-
 #include <pthread.h>
 
 #include "glusterfs.h"

libglusterfs/src/glusterfs.h

@@ -11,11 +11,6 @@
 #ifndef _GLUSTERFS_H
 #define _GLUSTERFS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

libglusterfs/src/graph-print.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/uio.h>
 
 #include "common-utils.h"

libglusterfs/src/graph.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <dlfcn.h>
 #include <netdb.h>

libglusterfs/src/hashfn.c

@@ -11,11 +11,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "hashfn.h"
 
 #define get16bits(d) (*((const uint16_t *) (d)))

libglusterfs/src/hashfn.h

@@ -11,11 +11,6 @@
 #ifndef __HASHFN_H__
 #define __HASHFN_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/types.h>
 #include <stdint.h>
 

libglusterfs/src/iatt.h

@@ -12,11 +12,6 @@
 #ifndef _IATT_H
 #define _IATT_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h> /* for iatt <--> stat conversions */
 #include <unistd.h>

libglusterfs/src/inode.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "inode.h"
 #include "fd.h"
 #include "common-utils.h"

libglusterfs/src/inode.h

@@ -11,11 +11,6 @@
 #ifndef _INODE_H
 #define _INODE_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdint.h>
 #include <sys/types.h>
 

libglusterfs/src/lkowner.h

@@ -11,11 +11,6 @@
 #ifndef _LK_OWNER_H
 #define _LK_OWNER_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define GF_MAX_LOCK_OWNER_LEN 1024 /* 1kB as per NLM */
 
 /* 16strings-16strings-... */

libglusterfs/src/locking.h

@@ -11,11 +11,6 @@
 #ifndef _LOCKING_H
 #define _LOCKING_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <pthread.h>
 
 #if HAVE_SPINLOCK

libglusterfs/src/logging.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>

libglusterfs/src/logging.h

@@ -11,11 +11,6 @@
 #ifndef __LOGGING_H__
 #define __LOGGING_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <sys/time.h>
 #include <stdint.h>
 #include <stdio.h>

libglusterfs/src/lvm-defaults.h

@@ -11,11 +11,6 @@
 #ifndef _LVM_DEFAULTS_H
 #define _LVM_DEFAULTS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define LVM_RESIZE "/sbin/lvresize"
 #define LVM_CREATE "/sbin/lvcreate"
 #define LVM_CONVERT "/sbin/lvconvert"

libglusterfs/src/options.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <fnmatch.h>
 
 #include "xlator.h"

libglusterfs/src/options.h

@@ -11,11 +11,6 @@
 #ifndef _OPTIONS_H
 #define _OPTIONS_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>

libglusterfs/src/stack.h

@@ -16,11 +16,6 @@
 #ifndef _STACK_H
 #define _STACK_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 struct _call_stack_t;
 typedef struct _call_stack_t call_stack_t;
 struct _call_frame_t;

libglusterfs/src/store.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <inttypes.h>
 #include <libgen.h>
 

libglusterfs/src/store.h

@@ -10,11 +10,6 @@
 #ifndef _GLUSTERD_STORE_H_
 #define _GLUSTERD_STORE_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "compat.h"
 #include "glusterfs.h"
 

libglusterfs/src/strfd.c

@@ -8,11 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdarg.h>
 
 #include "mem-types.h"

libglusterfs/src/syncop-utils.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "syncop.h"
 #include "common-utils.h"
 

libglusterfs/src/syncop.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "syncop.h"
 
 int

libglusterfs/src/syncop.h

@@ -11,11 +11,6 @@
 #ifndef _SYNCOP_H
 #define _SYNCOP_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <sys/time.h>
 #include <pthread.h>

libglusterfs/src/syscall.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "compat.h"
 #include "syscall.h"
 

libglusterfs/src/template-component-messages.h

@@ -11,11 +11,6 @@
 #ifndef _component_MESSAGES_H_
 #define _component_MESSAGES_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glfs-message-id.h"
 
 /* NOTE: Rules for message additions

libglusterfs/src/timer.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "timer.h"
 #include "logging.h"
 #include "common-utils.h"

libglusterfs/src/timer.h

@@ -11,11 +11,6 @@
 #ifndef _TIMER_H
 #define _TIMER_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glusterfs.h"
 #include "xlator.h"
 #include <sys/time.h>

libglusterfs/src/trie.h

@@ -11,11 +11,6 @@
 #ifndef _TRIE_H_
 #define _TRIE_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 struct trienode;
 typedef struct trienode trienode_t;
 

libglusterfs/src/xlator.c

@@ -8,11 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "xlator.h"
 #include <dlfcn.h>
 #include <netdb.h>

libglusterfs/src/xlator.h

@@ -11,11 +11,6 @@
 #ifndef _XLATOR_H
 #define _XLATOR_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>

rpc/rpc-lib/src/auth-glusterfs.c

@@ -10,11 +10,6 @@
 
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpcsvc.h"
 #include "list.h"
 #include "dict.h"

rpc/rpc-lib/src/auth-null.c

@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpcsvc.h"
 #include "list.h"
 #include "dict.h"

rpc/rpc-lib/src/auth-unix.c

@@ -10,11 +10,6 @@
 
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpcsvc.h"
 #include "list.h"
 #include "dict.h"

rpc/rpc-lib/src/rpc-clnt-ping.c

@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpc-clnt.h"
 #include "rpc-clnt-ping.h"
 #include "byte-order.h"

rpc/rpc-lib/src/rpc-clnt-ping.h

@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define RPC_DEFAULT_PING_TIMEOUT 30
 void
 rpc_clnt_check_and_start_ping (struct rpc_clnt *rpc_ptr);

rpc/rpc-lib/src/rpc-clnt.c

@@ -9,11 +9,6 @@
 */
 
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #define RPC_CLNT_DEFAULT_REQUEST_COUNT 512
 
 #include "rpc-clnt.h"

rpc/rpc-lib/src/rpc-drc.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"
 #ifndef RPC_DRC_H
 #include "rpc-drc.h"

rpc/rpc-lib/src/rpc-drc.h

@@ -11,11 +11,6 @@
 #ifndef RPC_DRC_H
 #define RPC_DRC_H
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "rpcsvc-common.h"
 #include "rpcsvc.h"
 #include "locking.h"

rpc/rpc-lib/src/rpc-lib-messages.h

@@ -11,11 +11,6 @@
 #ifndef _RPC_LIB_MESSAGES_H_
 #define _RPC_LIB_MESSAGES_H_
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "glfs-message-id.h"
 
 /* NOTE: Rules for message additions

rpc/rpc-lib/src/rpc-transport.c

@@ -15,11 +15,6 @@
 #include <fnmatch.h>
 #include <stdint.h>
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 #include "logging.h"
 #include "rpc-transport.h"
 #include "glusterfs.h"

rpc/rpc-lib/src/rpc-transport.h

@@ -11,11 +11,6 @@
 #ifndef __RPC_TRANSPORT_H__
 #define __RPC_TRANSPORT_H__
 
-#ifndef _CONFIG_H
-#define _CONFIG_H
-#include "config.h"
-#endif
-
 
 #include <inttypes.h>
 #ifdef GF_SOLARIS_HOST_OS