mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 04:31:29 +00:00
Backport r35869: move definition of _WIN32_WINNT into nbase_winconfig
This commit is contained in:
@@ -126,6 +126,17 @@
|
||||
|
||||
#ifndef NBASE_WINCONFIG_H
|
||||
#define 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 <sdkddkver.h>.
|
||||
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_WIN6
|
||||
#undef NTDDI_VERSION
|
||||
#define NTDDI_VERSION NTDDI_WIN6
|
||||
|
||||
//This disables the warning 4800 http://msdn.microsoft.com/en-us/library/b6801kcy(v=vs.71).aspx
|
||||
#pragma warning(disable : 4800)
|
||||
/* It doesn't really have struct IP, but we use a different one instead
|
||||
|
||||
@@ -125,15 +125,6 @@
|
||||
#ifndef NBASE_WINUNIX_H
|
||||
#define NBASE_WINUNIX_H
|
||||
|
||||
/* Define the earliest version of Windows we support. These control
|
||||
what parts of the Windows API are available. The available constants
|
||||
are in <sdkddkver.h>.
|
||||
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_WIN6
|
||||
#undef NTDDI_VERSION
|
||||
#define NTDDI_VERSION NTDDI_WIN6
|
||||
|
||||
#include "nbase_winconfig.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user