summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-26 17:44:25 +0000
commitf59ea5f7690c9a01ef6f7f6508084a66c40b1dae (patch)
tree482ee255d71f113be6c62e9ff3543fd6ebb9f12a /cmake
parentReleasing progress-linux version 4.2.2-1.1~progress7.99u1. (diff)
downloadwireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.tar.xz
wireshark-f59ea5f7690c9a01ef6f7f6508084a66c40b1dae.zip
Merging upstream version 4.2.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--cmakeconfig.h.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 4fc78fe8..5afe3a89 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -357,15 +357,17 @@
* for our needs.
* This should match the following:
* - The <compatibility><application> section in resources\wireshark.exe.manifest.in
- * - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi
+ * - The WinVer parts of packaging\nsis\wireshark.nsi
* - The VersionNT parts of packaging\wix\Prerequisites.wxi
*/
# ifndef NTDDI_VERSION
-# define NTDDI_VERSION NTDDI_WIN7
+// # define NTDDI_VERSION NTDDI_WIN7
+# define NTDDI_VERSION NTDDI_WIN10
# endif
# ifndef _WIN32_WINNT
-# define _WIN32_WINNT _WIN32_WINNT_WIN7
+// # define _WIN32_WINNT _WIN32_WINNT_WIN7
+# define _WIN32_WINNT _WIN32_WINNT_WIN10
# endif
#endif