From e3ff3a18a0c308d281b448d309e33bddcd6522ce Mon Sep 17 00:00:00 2001 From: Trond Norbye Date: Tue, 1 Apr 2014 21:13:01 +0200 Subject: [PATCH] Make config.h more explicit by including as src/config.h Change-Id: I8f0b2d13a0683b43df21653f6b91d547322e3d93 Reviewed-on: http://review.couchbase.org/35161 Reviewed-by: Trond Norbye Tested-by: Trond Norbye --- src/agent_config.c | 2 +- src/agent_ping.c | 2 +- src/agent_stats.c | 2 +- src/cache.c | 2 +- src/cache.h | 2 +- src/cproxy.c | 2 +- src/cproxy_config.c | 2 +- src/cproxy_front.c | 2 +- src/cproxy_multiget.c | 2 +- src/cproxy_protocol_a.c | 2 +- src/cproxy_protocol_a2a.c | 2 +- src/cproxy_protocol_a2b.c | 2 +- src/cproxy_protocol_b.c | 2 +- src/cproxy_protocol_b2b.c | 2 +- src/cproxy_stats.c | 2 +- src/daemon.c | 2 +- src/log.c | 2 +- src/matcher.c | 2 +- src/mcs.c | 2 +- src/mcs.h | 4 +--- src/memcached.h | 4 +--- src/redirects.h | 2 +- src/solaris_priv.c | 2 +- src/stdin_check.c | 2 +- src/testapp.c | 3 +-- src/util.c | 2 +- src/work.c | 2 +- src/work.h | 2 +- 28 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/agent_config.c b/src/agent_config.c index 502d6198..1372d28b 100644 --- a/src/agent_config.c +++ b/src/agent_config.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/agent_ping.c b/src/agent_ping.c index f604ede6..c1e8d2d7 100644 --- a/src/agent_ping.c +++ b/src/agent_ping.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/agent_stats.c b/src/agent_stats.c index 528da82c..68866643 100644 --- a/src/agent_stats.c +++ b/src/agent_stats.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cache.c b/src/cache.c index a7da2d68..19e7a599 100644 --- a/src/cache.c +++ b/src/cache.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #ifndef HAVE_UMEM_H #include diff --git a/src/cache.h b/src/cache.h index 0bf88460..6257112f 100644 --- a/src/cache.h +++ b/src/cache.h @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #ifndef CACHE_H #define CACHE_H -#include "config.h" +#include "src/config.h" #ifdef HAVE_UMEM_H #include diff --git a/src/cproxy.c b/src/cproxy.c index d0e53fff..2fea0978 100644 --- a/src/cproxy.c +++ b/src/cproxy.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_config.c b/src/cproxy_config.c index f67e464c..2d9ca0f6 100644 --- a/src/cproxy_config.c +++ b/src/cproxy_config.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_front.c b/src/cproxy_front.c index c0c65cf2..e96a4cb7 100644 --- a/src/cproxy_front.c +++ b/src/cproxy_front.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_multiget.c b/src/cproxy_multiget.c index 75bc3408..6f9d49ec 100644 --- a/src/cproxy_multiget.c +++ b/src/cproxy_multiget.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_protocol_a.c b/src/cproxy_protocol_a.c index b7faa35b..ab3a62f4 100644 --- a/src/cproxy_protocol_a.c +++ b/src/cproxy_protocol_a.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_protocol_a2a.c b/src/cproxy_protocol_a2a.c index f2352a4f..d123caa0 100644 --- a/src/cproxy_protocol_a2a.c +++ b/src/cproxy_protocol_a2a.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_protocol_a2b.c b/src/cproxy_protocol_a2b.c index 49b51c65..cb6cc9eb 100644 --- a/src/cproxy_protocol_a2b.c +++ b/src/cproxy_protocol_a2b.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_protocol_b.c b/src/cproxy_protocol_b.c index dfe8f252..bfc5af71 100644 --- a/src/cproxy_protocol_b.c +++ b/src/cproxy_protocol_b.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_protocol_b2b.c b/src/cproxy_protocol_b2b.c index 8519dd8d..32e98610 100644 --- a/src/cproxy_protocol_b2b.c +++ b/src/cproxy_protocol_b2b.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/cproxy_stats.c b/src/cproxy_stats.c index d507cc4e..e1727ca0 100644 --- a/src/cproxy_stats.c +++ b/src/cproxy_stats.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/daemon.c b/src/daemon.c index 22cea1f3..2375eaed 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -36,7 +36,7 @@ #ifndef WIN32 -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/log.c b/src/log.c index 41641e61..418dfec1 100644 --- a/src/log.c +++ b/src/log.c @@ -5,7 +5,7 @@ * mtaneja@zynga.com */ -#include "config.h" +#include "src/config.h" #undef write #include diff --git a/src/matcher.c b/src/matcher.c index 0895be6f..8560edee 100644 --- a/src/matcher.c +++ b/src/matcher.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/mcs.c b/src/mcs.c index 5c3025d5..8bb2ec23 100644 --- a/src/mcs.c +++ b/src/mcs.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/mcs.h b/src/mcs.h index bb69fc79..6de1191f 100644 --- a/src/mcs.h +++ b/src/mcs.h @@ -3,9 +3,7 @@ #ifndef MCS_H #define MCS_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "src/config.h" /* The mcs API's are a level of indirection from direct libmemcached */ /* and libvbucket API usage. */ diff --git a/src/memcached.h b/src/memcached.h index 99d85eb4..9ff6c36c 100644 --- a/src/memcached.h +++ b/src/memcached.h @@ -5,9 +5,7 @@ * structures and function prototypes. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "src/config.h" #include #include diff --git a/src/redirects.h b/src/redirects.h index 345ec961..f9641cf0 100644 --- a/src/redirects.h +++ b/src/redirects.h @@ -1,6 +1,6 @@ #ifndef REDIRECTS_H #define REDIRECTS_H -#include "config.h" +#include "src/config.h" #ifdef HAVE_CONFLATE_H #include diff --git a/src/solaris_priv.c b/src/solaris_priv.c index e7094857..023c788d 100644 --- a/src/solaris_priv.c +++ b/src/solaris_priv.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/stdin_check.c b/src/stdin_check.c index 305d9e34..1c6f5cb6 100644 --- a/src/stdin_check.c +++ b/src/stdin_check.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include diff --git a/src/testapp.c b/src/testapp.c index 955becab..16868066 100644 --- a/src/testapp.c +++ b/src/testapp.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #undef NDEBUG -#include "config.h" +#include "src/config.h" #include #include #include @@ -19,7 +19,6 @@ #include #include "protocol_binary.h" -#include "config.h" #include "cache.h" #include "util.h" diff --git a/src/util.c b/src/util.c index 060ed1a8..ad2da464 100644 --- a/src/util.c +++ b/src/util.c @@ -1,4 +1,4 @@ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/work.c b/src/work.c index 866b5ae6..f91e5756 100644 --- a/src/work.c +++ b/src/work.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -#include "config.h" +#include "src/config.h" #include #include #include diff --git a/src/work.h b/src/work.h index 2ad4b1a5..6e9b885e 100644 --- a/src/work.h +++ b/src/work.h @@ -3,7 +3,7 @@ #ifndef WORK_H #define WORK_H -#include "config.h" +#include "src/config.h" #include #include