From aad1a81b99d4f65d5debf2b34f237081baef03a6 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Sat, 3 Jan 2015 20:52:54 +0000 Subject: Fix out-of-tree build includes of config.h If a file in the same directory as config.h, e.g. wireshark-qt.cpp has a #include "config.h", or another header it includes also has a #include "config.h", then an out-of-tree build, e.g. CMake will pick up any in-tree config.h and odd things may happen. The correct form is #include which will pick up the out-of-tree version. To find this, introduce a deliberate error and then make an out-of-tree build, noting where it fails and fix that file. If that file includes other files that still cause the build to fail, set the compiler to emit the pre-processed version so you can locate the include with the next errant "config.h". Repeat ad nauseum. Possibly all includes of "config.h" should be changed to Revert "CMake: Clobber the top-level config.h before we build." This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. Ping-Bug: 10301 Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 Reviewed-on: https://code.wireshark.org/review/6285 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- codecs/codecs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'codecs') diff --git a/codecs/codecs.h b/codecs/codecs.h index 794cd32b63..80d0d71e2f 100644 --- a/codecs/codecs.h +++ b/codecs/codecs.h @@ -23,7 +23,7 @@ #ifndef _CODECS_H_ #define _CODECS_H_ -#include "config.h" +#include #include #include "ws_symbol_export.h" -- cgit v1.2.3