diff options
| -rw-r--r-- | cmakeconfig.h.in | 11 | ||||
| -rw-r--r-- | ui/qt/utils/data_printer.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 01810a1ec1..d60c411b6b 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -1,5 +1,8 @@ /* cmakeconfig.h.in */ +#ifndef __CONFIG_H__ +#define __CONFIG_H__ + /* Note: You cannot use earlier #defines in later #cmakedefines (cmake 2.6.2). */ /* Name of package */ @@ -408,7 +411,13 @@ * - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi * - The VersionNT parts of packaging\wix\Prerequisites.wxi */ +# if defined(NTDDI_VERSION) +# error NTDDI_VERSION already defined. +# endif # define NTDDI_VERSION NTDDI_VISTA +# if defined(_WIN32_WINNT) +# error _WIN32_WINNT already defined. +# endif # define _WIN32_WINNT _WIN32_WINNT_VISTA /* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */ @@ -443,3 +452,5 @@ #endif #include <ws_diag_control.h> + +#endif /* __CONFIG_H__ */ diff --git a/ui/qt/utils/data_printer.cpp b/ui/qt/utils/data_printer.cpp index 9d2d7740fb..e70fc2bd3d 100644 --- a/ui/qt/utils/data_printer.cpp +++ b/ui/qt/utils/data_printer.cpp @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include "ui/recent.h" - #include <ui/qt/utils/data_printer.h> +#include <ui/recent.h> + #include <stdint.h> #include <QApplication> |