Skip to content

Commit

Permalink
Make config.h more explicit by including as src/config.h
Browse files Browse the repository at this point in the history
Change-Id: I8f0b2d13a0683b43df21653f6b91d547322e3d93
Reviewed-on: http://review.couchbase.org/35161
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information
trondn committed Apr 1, 2014
1 parent ff299fa commit e3ff3a1
Show file tree
Hide file tree
Showing 28 changed files with 28 additions and 33 deletions.
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <umem.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <string.h>
#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <string.h>
#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion src/daemon.c
Expand Up @@ -36,7 +36,7 @@

#ifndef WIN32

#include "config.h"
#include "src/config.h"
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
Expand Down
2 changes: 1 addition & 1 deletion src/log.c
Expand Up @@ -5,7 +5,7 @@
* mtaneja@zynga.com
*/

#include "config.h"
#include "src/config.h"
#undef write
#include <sys/types.h>

Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
Expand Down
4 changes: 1 addition & 3 deletions src/mcs.h
Expand Up @@ -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. */
Expand Down
4 changes: 1 addition & 3 deletions src/memcached.h
Expand Up @@ -5,9 +5,7 @@
* structures and function prototypes.
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "src/config.h"

#include <stdio.h>
#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <conflate.h>
Expand Down
2 changes: 1 addition & 1 deletion src/solaris_priv.c
@@ -1,4 +1,4 @@
#include "config.h"
#include "src/config.h"
#include <stdlib.h>
#include <priv.h>
#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>

Expand Down
3 changes: 1 addition & 2 deletions 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 <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
Expand All @@ -19,7 +19,6 @@
#include <netinet/in.h>

#include "protocol_binary.h"
#include "config.h"
#include "cache.h"
#include "util.h"

Expand Down
2 changes: 1 addition & 1 deletion src/util.c
@@ -1,4 +1,4 @@
#include "config.h"
#include "src/config.h"
#include <stdio.h>
#include <assert.h>
#include <ctype.h>
Expand Down
2 changes: 1 addition & 1 deletion 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 <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion src/work.h
Expand Up @@ -3,7 +3,7 @@
#ifndef WORK_H
#define WORK_H

#include "config.h"
#include "src/config.h"

#include <sys/types.h>
#include <stdbool.h>
Expand Down

0 comments on commit e3ff3a1

Please sign in to comment.