diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-02 14:37:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-02 14:37:22 +0100 |
| commit | 21b3f6247403c06f85e1f45d219f87549862198f (patch) | |
| tree | 0038ae92f1cc7aaff0b55d6e5ac59efcc28bdf8f /ipc/chromium/src/base/sys_info_posix.cc | |
| parent | ff881bdb6795e0f307b93919f98f454bedde4bb6 (diff) | |
| parent | a9dc528a4a7b0aaad5308aff70963485ec3e9bec (diff) | |
| download | UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.gz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.lz UXP-21b3f6247403c06f85e1f45d219f87549862198f.tar.xz UXP-21b3f6247403c06f85e1f45d219f87549862198f.zip | |
Merge pull request #1262 from athenian200/solaris-work
Support Modern Solaris
Diffstat (limited to 'ipc/chromium/src/base/sys_info_posix.cc')
| -rw-r--r-- | ipc/chromium/src/base/sys_info_posix.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ipc/chromium/src/base/sys_info_posix.cc b/ipc/chromium/src/base/sys_info_posix.cc index 81ec78053..632aa2f37 100644 --- a/ipc/chromium/src/base/sys_info_posix.cc +++ b/ipc/chromium/src/base/sys_info_posix.cc @@ -121,7 +121,11 @@ std::wstring SysInfo::GetEnvVar(const wchar_t* var) { // static std::string SysInfo::OperatingSystemName() { +#ifndef XP_SOLARIS) utsname info; +#else + struct utsname info; +#endif if (uname(&info) < 0) { NOTREACHED(); return ""; @@ -129,9 +133,17 @@ std::string SysInfo::OperatingSystemName() { return std::string(info.sysname); } +// Solaris <sys/utsname.h> contains "extern struct utsname utsname;" +// As a consequence, any use of utsname has to be preceded with struct on +// Solaris. See Mozilla bugs 758483 and 1353332. + // static std::string SysInfo::CPUArchitecture() { +#ifndef XP_SOLARIS utsname info; +#else + struct utsname info; +#endif if (uname(&info) < 0) { NOTREACHED(); return ""; |