diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2017-09-29 17:36:55 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-01 15:10:19 +0000 |
| commit | d8903ce3975b57c3f4cbd24d58994a1db8c572c8 (patch) | |
| tree | db2e98df2281b42448ff83a4c03961612077d6f6 | |
| parent | be3b1291d4f3e1b2fbd6e075ffd42c60fbe4f739 (diff) | |
simplify some include file paths
For both autotools and cmake, the top-level source directory is always
part of the search path for include files. For include files in this
directory, we can simply use the file name. There's no need for a
relative path.
Change-Id: Ibf46265d91b5cb9bff4fa791e5b1d69ee3c1e165
Reviewed-on: https://code.wireshark.org/review/23798
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/stats_tree.h | 2 | ||||
| -rw-r--r-- | ui/qt/about_dialog.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/stats_tree.h b/epan/stats_tree.h index 615ca33de0..badb12646e 100644 --- a/epan/stats_tree.h +++ b/epan/stats_tree.h @@ -28,7 +28,7 @@ #include <epan/packet_info.h> #include <epan/tap.h> #include <epan/stat_groups.h> -#include "../register.h" +#include "register.h" #include "ws_symbol_export.h" #ifdef __cplusplus diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 25ce84edf0..c26b4b0052 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -37,8 +37,8 @@ #include <epan/wslua/init_wslua.h> #endif -#include "../../log.h" -#include "../../register.h" +#include "log.h" +#include "register.h" #include "ui/alert_box.h" #include "ui/last_open_dir.h" |