diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-03 20:52:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-04 00:26:13 +0000 |
| commit | aad1a81b99d4f65d5debf2b34f237081baef03a6 (patch) | |
| tree | 42d3d6cc720e2317ae6d7c53e24de151cc25846b /wireshark-qt.cpp | |
| parent | 938485436e7b7c647323a147c8ea1abc33e07564 (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 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 1bd2f6d61b..f8b708032b 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include <config.h> #include <glib.h> @@ -28,7 +28,7 @@ #endif #ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ +#include <zlib.h> /* to get the libz version number */ #endif #ifdef HAVE_GETOPT_H @@ -407,7 +407,7 @@ int main(int argc, char *argv[]) gboolean arg_error = FALSE; #ifdef _WIN32 - WSADATA wsaData; + WSADATA wsaData; #endif /* _WIN32 */ char *rf_path; |