diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-11-18 13:13:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 13:13:38 +0000 |
| commit | 62a72e3d281ea48e7b311a1c153a0e5ae7586da8 (patch) | |
| tree | d7bda130fdd8ab2614ce632e89a30b5ae730879e /ipc/chromium/src/base/sys_info_posix.cc | |
| parent | bd529c60c67af685de029e2408da3d2bc6980291 (diff) | |
| parent | 35cc4c128d22ccd02597f03e84245f06c7017144 (diff) | |
| download | UXP-62a72e3d281ea48e7b311a1c153a0e5ae7586da8.tar UXP-62a72e3d281ea48e7b311a1c153a0e5ae7586da8.tar.gz UXP-62a72e3d281ea48e7b311a1c153a0e5ae7586da8.tar.lz UXP-62a72e3d281ea48e7b311a1c153a0e5ae7586da8.tar.xz UXP-62a72e3d281ea48e7b311a1c153a0e5ae7586da8.zip | |
Merge pull request #1297 from athenian200/compiler-warning
Fix a compiler warning in ipc/chromium/src/base/sys_info_posix.cc.
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, 6 insertions, 6 deletions
diff --git a/ipc/chromium/src/base/sys_info_posix.cc b/ipc/chromium/src/base/sys_info_posix.cc index 632aa2f37..1f2cbdb13 100644 --- a/ipc/chromium/src/base/sys_info_posix.cc +++ b/ipc/chromium/src/base/sys_info_posix.cc @@ -121,11 +121,11 @@ std::wstring SysInfo::GetEnvVar(const wchar_t* var) { // static std::string SysInfo::OperatingSystemName() { -#ifndef XP_SOLARIS) +#ifndef XP_SOLARIS utsname info; #else struct utsname info; -#endif +#endif if (uname(&info) < 0) { NOTREACHED(); return ""; @@ -133,17 +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 <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 +#ifndef XP_SOLARIS utsname info; #else struct utsname info; -#endif +#endif if (uname(&info) < 0) { NOTREACHED(); return ""; |