diff options
| author | João Valverde <j@v6e.pt> | 2021-09-20 18:54:54 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2021-09-20 20:11:23 +0100 |
| commit | 2c7d22dba279721e776a712a8e2e98981e562fdf (patch) | |
| tree | 4b9efe947a4cf68b06eb8324793074ad89ce7a67 /cmakeconfig.h.in | |
| parent | 76e31fe09e305e58b11991808dc9be59cba32004 (diff) | |
CMake: Fix macro redefinition of Windows API versioning
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 7873d0b802..35699397a4 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -289,23 +289,6 @@ #cmakedefine YYTEXT_POINTER #if defined(_WIN32) - /* - * Make sure everyone is using the same API and that it's sufficient - * for our needs. - * This should match the following: - * - The <compatibility><application> section in image\wireshark.exe.manifest.in - * - 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_WIN7 -# if defined(_WIN32_WINNT) -# error _WIN32_WINNT already defined. -# endif -# define _WIN32_WINNT _WIN32_WINNT_WIN7 - /* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */ # ifndef WIN32 # define WIN32 1 |