From 97546165fafc0fa05ba08f1c2927f0fa22d24e93 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Fri, 22 Aug 2014 22:13:05 +0100 Subject: [PATCH] Modify includes of config.h so that out-of-tree builds, i.e. CMake don't pick up the in-tree copy. Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71 Reviewed-on: https://code.wireshark.org/review/3798 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall Reviewed-by: Graham Bloice --- capinfos.c | 2 +- capture_info.c | 2 +- capture_opts.c | 2 +- capture_stop_conditions.c | 2 +- captype.c | 2 +- cfile.c | 2 +- color_filters.c | 2 +- conditions.c | 2 +- dftest.c | 2 +- dumpcap.c | 2 +- echld_test.c | 2 +- editcap.c | 2 +- extcap.c | 4 ++-- extcap.h | 2 +- extcap_parser.c | 2 +- file.c | 2 +- fileset.c | 2 +- frame_tvbuff.c | 2 +- mergecap.c | 2 +- pcapio.c | 2 +- randpkt.c | 2 +- rawshark.c | 2 +- reordercap.c | 2 +- ringbuffer.c | 2 +- summary.c | 2 +- sync_pipe_write.c | 2 +- text2pcap.c | 2 +- tfshark.c | 2 +- tshark.c | 2 +- version_info.c | 2 +- wsutil/unicode-utils.h | 2 +- 31 files changed, 32 insertions(+), 32 deletions(-) diff --git a/capinfos.c b/capinfos.c index b3b58be8d7..571c419047 100644 --- a/capinfos.c +++ b/capinfos.c @@ -54,7 +54,7 @@ */ -#include "config.h" +#include #include #include diff --git a/capture_info.c b/capture_info.c index 3ef12df504..3a4abc3d02 100644 --- a/capture_info.c +++ b/capture_info.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #ifdef HAVE_LIBPCAP diff --git a/capture_opts.c b/capture_opts.c index 9d5620c0f2..f783d9f811 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/capture_stop_conditions.c b/capture_stop_conditions.c index 9f37592450..b42facdb8e 100644 --- a/capture_stop_conditions.c +++ b/capture_stop_conditions.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/captype.c b/captype.c index d37ee90d78..6dd1769ac2 100644 --- a/captype.c +++ b/captype.c @@ -23,7 +23,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/cfile.c b/cfile.c index 08d73bed90..7d6a0d8e43 100644 --- a/cfile.c +++ b/cfile.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include diff --git a/color_filters.c b/color_filters.c index d30871573a..297d4ead4c 100644 --- a/color_filters.c +++ b/color_filters.c @@ -23,7 +23,7 @@ * Updated 1 Dec 10 jjm */ -#include "config.h" +#include #include diff --git a/conditions.c b/conditions.c index 458168b298..aaaf959946 100644 --- a/conditions.c +++ b/conditions.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/dftest.c b/dftest.c index db9eeb0d2c..0ef6a9342e 100644 --- a/dftest.c +++ b/dftest.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/dumpcap.c b/dumpcap.c index 7bb7dd994f..68ce88fd0c 100644 --- a/dumpcap.c +++ b/dumpcap.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include /* for exit() */ diff --git a/echld_test.c b/echld_test.c index 0cc30b38ab..1abb3ae8d2 100644 --- a/echld_test.c +++ b/echld_test.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #ifdef HAVE_FCNTL_H #include diff --git a/editcap.c b/editcap.c index ebdab74d34..7d0381cdcc 100644 --- a/editcap.c +++ b/editcap.c @@ -26,7 +26,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/extcap.c b/extcap.c index a676fc7233..73b04bf2ca 100644 --- a/extcap.c +++ b/extcap.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include @@ -178,7 +178,7 @@ static void extcap_foreach(gint argc, gchar **args, extcap_cb_t cb, argv[argc+1] = NULL; status = g_spawn_sync(dirname, argv, NULL, - (GSpawnFlags) 0, NULL, NULL, + (GSpawnFlags) 0, NULL, NULL, &command_output, NULL, &exit_status, &error); if (status && exit_status == 0) diff --git a/extcap.h b/extcap.h index 64ea855045..675a817dbb 100644 --- a/extcap.h +++ b/extcap.h @@ -24,7 +24,7 @@ #ifndef __EXTCAP_H__ #define __EXTCAP_H__ -#include "config.h" +#include #include diff --git a/extcap_parser.c b/extcap_parser.c index 274428f981..8fdbb1f0f5 100644 --- a/extcap_parser.c +++ b/extcap_parser.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/file.c b/file.c index edfca6a860..8324b7ab7f 100644 --- a/file.c +++ b/file.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #ifdef HAVE_UNISTD_H #include diff --git a/fileset.c b/fileset.c index 1c1a69fb4f..9caf95f141 100644 --- a/fileset.c +++ b/fileset.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #ifdef HAVE_UNISTD_H #include diff --git a/frame_tvbuff.c b/frame_tvbuff.c index c577f4693a..70b1e1d103 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include diff --git a/mergecap.c b/mergecap.c index 748a317feb..3e26f9c682 100644 --- a/mergecap.c +++ b/mergecap.c @@ -23,7 +23,7 @@ * */ -#include "config.h" +#include #include #include diff --git a/pcapio.c b/pcapio.c index 91cec77f52..9020acd4a3 100644 --- a/pcapio.c +++ b/pcapio.c @@ -38,7 +38,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/randpkt.c b/randpkt.c index 5393fa9ee1..c08109ddea 100644 --- a/randpkt.c +++ b/randpkt.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #ifdef HAVE_UNISTD_H #include diff --git a/rawshark.c b/rawshark.c index 53ad1ac022..7de15440c9 100644 --- a/rawshark.c +++ b/rawshark.c @@ -32,7 +32,7 @@ * - Prints a status line, followed by fields from a specified list. */ -#include "config.h" +#include #include #include diff --git a/reordercap.c b/reordercap.c index fc610fab5a..7ca14144ed 100644 --- a/reordercap.c +++ b/reordercap.c @@ -21,7 +21,7 @@ * */ -#include "config.h" +#include #include #include diff --git a/ringbuffer.c b/ringbuffer.c index 63cf47f00c..ffd02ae356 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -40,7 +40,7 @@ * */ -#include "config.h" +#include #ifdef HAVE_LIBPCAP diff --git a/summary.c b/summary.c index dd492d62e0..d7f77a4ff6 100644 --- a/summary.c +++ b/summary.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include diff --git a/sync_pipe_write.c b/sync_pipe_write.c index d8a09fc91b..ea732ee3cd 100644 --- a/sync_pipe_write.c +++ b/sync_pipe_write.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include diff --git a/text2pcap.c b/text2pcap.c index 3292902a8f..f15001bd99 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -75,7 +75,7 @@ * snaplength is automatically set to 64KiB-1. */ -#include "config.h" +#include /* * Just make sure we include the prototype for strptime as well diff --git a/tfshark.c b/tfshark.c index e7d4dd3515..445c79ff6b 100644 --- a/tfshark.c +++ b/tfshark.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/tshark.c b/tshark.c index 3ab45edb71..e800eb63ca 100644 --- a/tshark.c +++ b/tshark.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include #include diff --git a/version_info.c b/version_info.c index 03785f9142..8ea9162778 100644 --- a/version_info.c +++ b/version_info.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include #include diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index 2674a6ca8f..21e74968ee 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -23,7 +23,7 @@ #ifndef __UNICODEUTIL_H__ #define __UNICODEUTIL_H__ -#include "config.h" +#include #include "ws_symbol_export.h"