Merge pull request #7170 from alalek:fix_build

This commit is contained in:
Alexander Alekhin
2016-08-29 10:15:58 +00:00
5 changed files with 12 additions and 32 deletions
+1 -1
View File
@@ -521,7 +521,7 @@ int cv::getNumberOfCPUs(void)
{
#if defined WIN32 || defined _WIN32
SYSTEM_INFO sysinfo;
#if defined(_M_ARM) || defined(_M_X64) || defined(WINRT)
#if (defined(_M_ARM) || defined(_M_X64) || defined(WINRT)) && _WIN32_WINNT >= 0x501
GetNativeSystemInfo( &sysinfo );
#else
GetSystemInfo( &sysinfo );