path: root/codecs
diff options
authorGraham Bloice <graham.bloice@trihedral.com>2015-01-03 20:52:54 +0000
committerGerald Combs <gerald@wireshark.org>2015-01-04 00:26:13 +0000
commitaad1a81b99d4f65d5debf2b34f237081baef03a6 (patch)
tree42d3d6cc720e2317ae6d7c53e24de151cc25846b /codecs
parent938485436e7b7c647323a147c8ea1abc33e07564 (diff)
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 <config.h> 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 <config.h> 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 <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'codecs')
1 files changed, 1 insertions, 1 deletions
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 <config.h>
#include <epan/epan.h>
#include "ws_symbol_export.h"