summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2019-11-18 06:40:09 -0600
committerathenian200 <athenian200@outlook.com>2019-11-18 06:40:09 -0600
commit35cc4c128d22ccd02597f03e84245f06c7017144 (patch)
tree780278abc296a994b26059787963ce094c139a06
parentf31b04a303607cd82757e7c4f60bb536658c8a30 (diff)
downloadUXP-35cc4c128d22ccd02597f03e84245f06c7017144.tar
UXP-35cc4c128d22ccd02597f03e84245f06c7017144.tar.gz
UXP-35cc4c128d22ccd02597f03e84245f06c7017144.tar.lz
UXP-35cc4c128d22ccd02597f03e84245f06c7017144.tar.xz
UXP-35cc4c128d22ccd02597f03e84245f06c7017144.zip
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.
-rw-r--r--ipc/chromium/src/base/sys_info_posix.cc12
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 "";