diff options
| author | dmitry <none@none> | 2013-08-22 11:38:42 +0300 |
|---|---|---|
| committer | dmitry <none@none> | 2013-08-22 11:38:42 +0300 |
| commit | f515c132e426c9da9f8823b6c2083952351de6df (patch) | |
| tree | 80f6928f987efee0f9c50c07a16e11fa5ee2e6c5 /indra | |
| parent | 33a4d333e96e8c1c501f1afeced1d5e088cb8b1e (diff) | |
MAINT-2850 Fix for linux build
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llcommon/llsys.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index a3832ee447..c2bd476d69 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -211,6 +211,7 @@ static bool regex_search_no_exc(const S& string, M& match, const R& regex) } } +#if LL_WINDOWS // 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) { @@ -228,6 +229,7 @@ static bool check_for_version(WORD wMajorVersion, WORD wMinorVersion, WORD wServ return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; } +#endif LLOSInfo::LLOSInfo() : |