aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-12-08 10:44:44 -0800
committerAnders Broman <a.broman58@gmail.com>2017-12-10 07:50:14 +0000
commitd0d1eaadf0c92e37b6ed2883583f71b7b9ec3a7e (patch)
treebde9885f848acad879156692a5c36d3175182182 /sharkd.h
parent3d673da88c5ff4e56cbb3cf713b8c49704e62923 (diff)
Win32: Add checks for _WIN32_WINNT and NTDDI_VERSION.
Check to see if we're the source of truth for _WIN32_WINNT and NTDDI_VERSION in config.h and emit a compiler error if we aren't. Rearrange the #includes in ui/qt/data_printer.cpp so that config.h is included first. This fixes the following: 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(411): warning C4005: 'NTDDI_VERSION': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(223): note: see previous definition of 'NTDDI_VERSION' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) 136>C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\config.h(412): warning C4005: '_WIN32_WINNT': macro redefinition (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) [C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\cmbuild\ui\qt\qtui.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\shared\sdkddkver.h(213): note: see previous definition of '_WIN32_WINNT' (compiling source file C:\buildbot\wireshark\wireshark-master-64\windows-2016-x64\build\ui\qt\utils\data_printer.cpp) Change-Id: I90886cb9450463d768d6529ccd678ca11508cde2 Reviewed-on: https://code.wireshark.org/review/24744 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'sharkd.h')
0 files changed, 0 insertions, 0 deletions