summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-04-12 16:36:56 -0400
committerGennadiy Civil <misterg@google.com>2019-04-12 16:36:56 -0400
commit39f72ea6f5cd458860b563d7bcb7ea67546e6ea3 (patch)
tree807876d92502cbbf56d4dcfedf047b3ed4931904
parentadc8a88ff0c5c85413d37af20343faa6c197abad (diff)
parent698d45d3a400db7265e5c0b28a7272c7ea93b36a (diff)
downloadgoogletest-39f72ea6f5cd458860b563d7bcb7ea67546e6ea3.tar.gz
googletest-39f72ea6f5cd458860b563d7bcb7ea67546e6ea3.zip
Merge pull request #2230 from return:style-issue
PiperOrigin-RevId: 243313653
-rw-r--r--googletest/include/gtest/internal/gtest-port.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 6c52cc8e..0a9a3314 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -115,9 +115,9 @@
// GTEST_OS_CYGWIN - Cygwin
// GTEST_OS_DRAGONFLY - DragonFlyBSD
// GTEST_OS_FREEBSD - FreeBSD
-// GTEST_OS_HAIKU - Haiku
// GTEST_OS_FUCHSIA - Fuchsia
// GTEST_OS_GNU_KFREEBSD - GNU/kFreeBSD
+// GTEST_OS_HAIKU - Haiku
// GTEST_OS_HPUX - HP-UX
// GTEST_OS_LINUX - Linux
// GTEST_OS_LINUX_ANDROID - Google Android
@@ -137,7 +137,7 @@
// GTEST_OS_WINDOWS_RT - Windows Store App/WinRT
// GTEST_OS_ZOS - z/OS
//
-// Among the platforms, Cygwin, Linux, Max OS X, and Windows have the
+// Among the platforms, Cygwin, Linux, Mac OS X, and Windows have the
// most stable support. Since core members of the Google Test project
// don't have access to other platforms, support for them may be less
// stable. If you notice any problems on your platform, please notify
OpenPOWER on IntegriCloud