aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-17 13:25:52 -0400
committerGitHub <noreply@github.com>2018-08-17 13:25:52 -0400
commit88cd66513c6414cdc6f1d4f7733bd520337864a9 (patch)
tree1dfda4ad834dd8f7231c37a5452b6a073832837f
parent687964c84f798ce331fc60f6b8f212410ef46b3c (diff)
downloadgoogletest-88cd66513c6414cdc6f1d4f7733bd520337864a9.tar.gz
googletest-88cd66513c6414cdc6f1d4f7733bd520337864a9.tar.bz2
googletest-88cd66513c6414cdc6f1d4f7733bd520337864a9.zip
Minor formatting/style changes
-rw-r--r--googletest/src/gtest.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 7832aa31..a229549f 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -138,11 +138,10 @@
# define vsnprintf _vsnprintf
#endif // GTEST_OS_WINDOWS
-
#if GTEST_OS_MAC
-# ifndef GTEST_OS_IOS
-# include <crt_externs.h>
-# endif
+#ifndef GTEST_OS_IOS
+#include <crt_externs.h>
+#endif
#endif
#if GTEST_HAS_ABSL
@@ -5832,16 +5831,16 @@ void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) {
// other parts of Google Test.
void ParseGoogleTestFlagsOnly(int* argc, char** argv) {
ParseGoogleTestFlagsOnlyImpl(argc, argv);
-
- // Fix the value of *_NSGetArgc() on macOS, but iff
+
+ // Fix the value of *_NSGetArgc() on macOS, but iff
// *_NSGetArgv() == argv
// Only applicable to char** version of argv
#if GTEST_OS_MAC
-# ifndef GTEST_OS_IOS
+#ifndef GTEST_OS_IOS
if (*_NSGetArgv() == argv) {
*_NSGetArgc() = *argc;
}
-# endif
+#endif
#endif
}
void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) {