diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-10-26 09:05:06 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-10-26 17:57:28 +0000 |
| commit | b7f7bee8cf6ecb04a4dec86b80ce2065d4192da7 (patch) | |
| tree | 1c9817bb874e6b94882adf9ac6b9cd4a34927e8d /cmakeconfig.h.in | |
| parent | de6fcf2f21ee0a69b1d4d418f0c6d184b161a203 (diff) | |
CMake: Set the Windows build target to Vista.
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that
ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated
compiler version checks so that everyone is on the same page.
Add breadcrumbs to the various parts of the code where we set a minimum
Windows version.
Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291
Reviewed-on: https://code.wireshark.org/review/24080
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index b4a4c8fe93..085dbc3a64 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -406,6 +406,16 @@ #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 + */ +# define NTDDI_VERSION NTDDI_VISTA +# define _WIN32_WINNT _WIN32_WINNT_VISTA /* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */ # ifndef WIN32 @@ -418,20 +428,12 @@ /* FIXME: Detection doesn't work */ # define HAVE_NTDDNDIS_H 1 - /* Visual C 9 (2008), Visual C 10 (2010), Visual C 11 (2012) and Visual C 12 (2013) - * need these prototypes - * XXX: Can we use MSC_VER >= 1500 ?? */ -# if _MSC_VER == 1500 || _MSC_VER == 1600 || _MSC_VER == 1700 || _MSC_VER == 1800 -# define NTDDI_VERSION NTDDI_WINXPSP3 -# define _WIN32_WINNT _WIN32_WINNT_WINXP -# endif /* * Flex (v 2.5.35) uses this symbol to "exclude" unistd.h */ # define YY_NO_UNISTD_H - # define strncasecmp strnicmp # define popen _popen # define pclose _pclose |