diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 30 | 
1 files changed, 15 insertions, 15 deletions
| diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 17099b812c..a3832ee447 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -212,21 +212,21 @@ static bool regex_search_no_exc(const S& string, M& match, const R& regex)  }  // GetVersionEx should not works correct with Windows 8.1 and the later version. We need to check this case  -static bool	check_for_version(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor)
 -{
 -    OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 };
 -    DWORDLONG        const dwlConditionMask = VerSetConditionMask(
 -        VerSetConditionMask(
 -        VerSetConditionMask(
 -            0, VER_MAJORVERSION, VER_GREATER_EQUAL),
 -               VER_MINORVERSION, VER_GREATER_EQUAL),
 -               VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
 -
 -    osvi.dwMajorVersion = wMajorVersion;
 -    osvi.dwMinorVersion = wMinorVersion;
 -    osvi.wServicePackMajor = wServicePackMajor;
 -
 -    return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
 +static bool	check_for_version(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor) +{ +    OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 }; +    DWORDLONG        const dwlConditionMask = VerSetConditionMask( +        VerSetConditionMask( +        VerSetConditionMask( +            0, VER_MAJORVERSION, VER_GREATER_EQUAL), +               VER_MINORVERSION, VER_GREATER_EQUAL), +               VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL); + +    osvi.dwMajorVersion = wMajorVersion; +    osvi.dwMinorVersion = wMinorVersion; +    osvi.wServicePackMajor = wServicePackMajor; + +    return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;  } | 
