From: Serge Gautherie Date: Mon, 19 Dec 2016 03:59:00 +0100 Subject: [PSDK] sdkddkver.h, "NTDDI_VERSION and _WIN32_WINNT match" check: *Warn about not checked (yet) NTDDI_VERSION. *Add WIN6 and WIN7 checks. CORE-12588 diff --git a/reactos/sdk/include/psdk/sdkddkver.h b/reactos/sdk/include/psdk/sdkddkver.h index 26a9a70..10a70bc 100644 --- a/reactos/sdk/include/psdk/sdkddkver.h +++ b/reactos/sdk/include/psdk/sdkddkver.h @@ -177,11 +177,20 @@ Abstract: #endif /* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */ +#if (OSVER(NTDDI_VERSION) != NTDDI_WIN2K) && \ + (OSVER(NTDDI_VERSION) != NTDDI_WINXP) && \ + (OSVER(NTDDI_VERSION) != NTDDI_WS03 ) && \ + (OSVER(NTDDI_VERSION) != NTDDI_WIN6 ) && \ + (OSVER(NTDDI_VERSION) != NTDDI_WIN7 ) +#warning NTDDI_VERSION and _WIN32_WINNT match check: not checked (yet) NTDDI_VERSION. +#else #if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \ ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \ - ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03)) || \ - ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) + ((OSVER(NTDDI_VERSION) == NTDDI_WS03 ) && (_WIN32_WINNT != _WIN32_WINNT_WS03 )) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WIN6 ) && (_WIN32_WINNT != _WIN32_WINNT_WIN6 )) || \ + ((OSVER(NTDDI_VERSION) == NTDDI_WIN7 ) && (_WIN32_WINNT != _WIN32_WINNT_WIN7 )) #error NTDDI_VERSION and _WIN32_WINNT mismatch! #endif +#endif #endif