From f90587f13197bc34219e9a9b3f48938816dd9360 Mon Sep 17 00:00:00 2001 From: dmiller Date: Sat, 4 Jun 2016 02:46:13 +0000 Subject: [PATCH] Bump earliest supported Windows version to Vista, enabling poll nsock engine. --- nbase/nbase_winunix.h | 8 ++++---- nsock/include/nsock_winconfig.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nbase/nbase_winunix.h b/nbase/nbase_winunix.h index 7c5377b78..79dbcfc2c 100644 --- a/nbase/nbase_winunix.h +++ b/nbase/nbase_winunix.h @@ -125,17 +125,17 @@ #ifndef NBASE_WINUNIX_H #define NBASE_WINUNIX_H -#include "nbase_winconfig.h" - /* Define the earliest version of Windows we support. These control what parts of the Windows API are available. The available constants are in . http://msdn.microsoft.com/en-us/library/aa383745.aspx http://blogs.msdn.com/oldnewthing/archive/2007/04/11/2079137.aspx */ #undef _WIN32_WINNT -#define _WIN32_WINNT _WIN32_WINNT_WIN2K +#define _WIN32_WINNT _WIN32_WINNT_WIN6 #undef NTDDI_VERSION -#define NTDDI_VERSION NTDDI_WIN2KSP4 +#define NTDDI_VERSION NTDDI_WIN6 + +#include "nbase_winconfig.h" /* Winsock defines its own error codes that are analogous to but different from those in . The error macros have similar diff --git a/nsock/include/nsock_winconfig.h b/nsock/include/nsock_winconfig.h index 0f281c8cb..aa9162e12 100644 --- a/nsock/include/nsock_winconfig.h +++ b/nsock/include/nsock_winconfig.h @@ -99,6 +99,8 @@ #define PCAP_NETMASK_UNKNOWN 0 #endif +/* Need this for _WIN32_WINNT below */ +#include /* WSAPoll() isn't available before Vista */ #if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) #define HAVE_POLL 1