Merge branch 'master' into remodel

Conflicts:
	windows/winapi.hpp
(manually resolved by elaborating comment)
This commit is contained in:
Pietro Gagliardi 2020-10-02 10:30:58 -04:00
commit 47f2bffd8a
2 changed files with 2 additions and 1 deletions

View File

@ -12,6 +12,7 @@
// get Windows version right; right now Windows Vista
// unless otherwise stated, all values from Microsoft's sdkddkver.h
// TODO is all of this necessary? how is NTDDI_VERSION used?
// TODO vista platform update sp2?
#define WINVER 0x0600 /* from Microsoft's winnls.h */
#define _WIN32_WINNT 0x0600
#define _WIN32_WINDOWS 0x0600 /* from Microsoft's pdh.h */

View File

@ -16,7 +16,7 @@
// get Windows version right; right now Windows Vista
// unless otherwise stated, all values from Microsoft's sdkddkver.h
// TODO is all of this necessary? how is NTDDI_VERSION used?
// TODO plaform update sp2
// TODO platform update sp2
#define WINVER 0x0600 /* from Microsoft's winnls.h */
#define _WIN32_WINNT 0x0600
#define _WIN32_WINDOWS 0x0600 /* from Microsoft's pdh.h */