From 35cc4c128d22ccd02597f03e84245f06c7017144 Mon Sep 17 00:00:00 2001 From: athenian200 Date: Mon, 18 Nov 2019 06:40:09 -0600 Subject: Issue #457 - Fix typo in ipc/chromium/src/base/sys_info_posix.cc I made a typo in commit 687a789 when updating the ifdef style I used to comply with UXP standards. The typo I made resulted in a compiler warning I failed to notice, so I was asked to tag issue #457 when submitting the PR. I also fixed some trailing whitespace I apparently left behind in the file. --- ipc/chromium/src/base/sys_info_posix.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ipc/chromium/src') 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 contains "extern struct utsname utsname;" -// As a consequence, any use of utsname has to be preceded with struct on +// Solaris 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 ""; -- cgit v1.2.3