Skip to content

Commit

Permalink
Merge pull request dotnet/coreclr#5055 from dotnet-bot/from-tfs
Browse files Browse the repository at this point in the history
Merge changes from TFS

Commit migrated from dotnet/coreclr@4716d27
  • Loading branch information
BruceForstall committed May 18, 2016
2 parents 10effab + 3829741 commit 286c1be
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/coreclr/src/vm/gcenv.os.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,8 @@ uint32_t GCToOSInterface::GetCurrentProcessCpuCount()
// non zero if it has succeeded, 0 if it has failed
size_t GCToOSInterface::GetVirtualMemoryLimit()
{
LIMITED_METHOD_CONTRACT;

MEMORYSTATUSEX memStatus;
::GetProcessMemoryLoad(&memStatus);

Expand Down

0 comments on commit 286c1be

Please sign in to comment.