Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore Obsidian Win10 patch.

Browse Source
This commit is contained in:
Lirusaito
2016-03-06 18:50:26 -05:00
parent 77809f704e
commit 1449169b0a
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llcommon/llsys.cpp
View File

@@ -101,15 +101,6 @@ static const F32 MEM_INFO_THROTTLE = 20;
// dropped below the login framerate, we'd have very little additional data. // dropped below the login framerate, we'd have very little additional data.
static const F32 MEM_INFO_WINDOW = 10*60; static const F32 MEM_INFO_WINDOW = 10*60;
#if LL_WINDOWS
#pragma warning(disable : 4996)
#ifndef _WIN32_WINNT_WIN10
#define _WIN32_WINNT_WIN10 0x0A00
#endif
#endif // LL_WINDOWS
// Wrap boost::regex_match() with a function that doesn't throw. // Wrap boost::regex_match() with a function that doesn't throw.
template <typename S, typename M, typename R> template <typename S, typename M, typename R>
static bool regex_match_no_exc(const S& string, M& match, const R& regex) static bool regex_match_no_exc(const S& string, M& match, const R& regex)
@@ -149,7 +140,7 @@ LLOSInfo::LLOSInfo() :
#if LL_WINDOWS #if LL_WINDOWS
bool is_server = IsWindowsServer(); bool is_server = IsWindowsServer();
std::string service_pack; std::string service_pack;
if (IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN10), LOBYTE(_WIN32_WINNT_WIN10), 0)) if (IsWindows10OrGreater())
{ {
if (is_server) if (is_server)
{ {