diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:53:18 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:53:18 +0000 |
| commit | 6e001bbb455a9555b95df2f8098ef105d022978b (patch) | |
| tree | 9853dd57ceacc4e0714c645fc238edd750d966e6 /base/sys_info_posix.cc | |
| parent | 2195b63a6464c9c9bea81e00ba0ba0e625b966cd (diff) | |
| download | chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.zip chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.tar.gz chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.tar.bz2 | |
Fix OperatingSystemName and OperatingSystemVersion on Mac
Prior to this change the posix implementations are used, so the return values are "Darwin" and the Darwin version.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7065041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_posix.cc')
| -rw-r--r-- | base/sys_info_posix.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc index 3f487e5..3da08e1 100644 --- a/base/sys_info_posix.cc +++ b/base/sys_info_posix.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -46,6 +46,7 @@ int64 SysInfo::AmountOfFreeDiskSpace(const FilePath& path) { return static_cast<int64>(stats.f_bavail) * stats.f_frsize; } +#if !defined(OS_MACOSX) // static std::string SysInfo::OperatingSystemName() { utsname info; @@ -65,6 +66,7 @@ std::string SysInfo::OperatingSystemVersion() { } return std::string(info.release); } +#endif // static std::string SysInfo::CPUArchitecture() { |