Revise C++ coding style using clang-format-6.0

Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`.  Use `clang-format` version 6.0.

* If you reached this commit for a line in `git blame`, re-run the blame
  operation starting at the parent of this commit to see older history
  for the content.

* See the parent commit for instructions to rebase a change across this
  style transition commit.

2 files changed, 80 insertions, 80 deletions

diff --git a/Tests/Preprocess/preprocess.c b/Tests/Preprocess/preprocess.c
index 1b038b0c5d..2913f937a2 100644
--- a/Tests/Preprocess/preprocess.c
+++ b/Tests/Preprocess/preprocess.c
@@ -33,117 +33,117 @@ int check_defines_C(void)
     }
   }
 #ifdef NDEBUG
-#ifdef FILE_DEF_DEBUG
+#  ifdef FILE_DEF_DEBUG
   {
     fprintf(stderr, "FILE_DEF_DEBUG should not be defined in C\n");
     result = 0;
   }
-#endif
-#ifdef TARGET_DEF_DEBUG
+#  endif
+#  ifdef TARGET_DEF_DEBUG
   {
     fprintf(stderr, "TARGET_DEF_DEBUG should not be defined in C\n");
     result = 0;
   }
-#endif
-#ifdef DIRECTORY_DEF_DEBUG
+#  endif
+#  ifdef DIRECTORY_DEF_DEBUG
   {
     fprintf(stderr, "DIRECTORY_DEF_DEBUG should not be defined in C\n");
     result = 0;
   }
-#endif
-#ifndef FILE_DEF_RELEASE
-#ifndef PREPROCESS_XCODE
+#  endif
+#  ifndef FILE_DEF_RELEASE
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr, "FILE_DEF_RELEASE should be defined in C\n");
     result = 0;
   }
-#endif
-#endif
-#ifndef TARGET_DEF_RELEASE
+#    endif
+#  endif
+#  ifndef TARGET_DEF_RELEASE
   {
     fprintf(stderr, "TARGET_DEF_RELEASE should be defined in C\n");
     result = 0;
   }
-#endif
-#ifndef DIRECTORY_DEF_RELEASE
+#  endif
+#  ifndef DIRECTORY_DEF_RELEASE
   {
     fprintf(stderr, "DIRECTORY_DEF_RELEASE should be defined in C\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #ifdef PREPROCESS_DEBUG
-#ifndef FILE_DEF_DEBUG
-#ifndef PREPROCESS_XCODE
+#  ifndef FILE_DEF_DEBUG
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr, "FILE_DEF_DEBUG should be defined in C\n");
     result = 0;
   }
-#endif
-#endif
-#ifndef TARGET_DEF_DEBUG
+#    endif
+#  endif
+#  ifndef TARGET_DEF_DEBUG
   {
     fprintf(stderr, "TARGET_DEF_DEBUG should be defined in C\n");
     result = 0;
   }
-#endif
-#ifndef DIRECTORY_DEF_DEBUG
+#  endif
+#  ifndef DIRECTORY_DEF_DEBUG
   {
     fprintf(stderr, "DIRECTORY_DEF_DEBUG should be defined in C\n");
     result = 0;
   }
-#endif
-#ifdef FILE_DEF_RELEASE
+#  endif
+#  ifdef FILE_DEF_RELEASE
   {
     fprintf(stderr, "FILE_DEF_RELEASE should not be defined in C\n");
     result = 0;
   }
-#endif
-#ifdef TARGET_DEF_RELEASE
+#  endif
+#  ifdef TARGET_DEF_RELEASE
   {
     fprintf(stderr, "TARGET_DEF_RELEASE should not be defined in C\n");
     result = 0;
   }
-#endif
-#ifdef DIRECTORY_DEF_RELEASE
+#  endif
+#  ifdef DIRECTORY_DEF_RELEASE
   {
     fprintf(stderr, "DIRECTORY_DEF_RELEASE should not be defined in C\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
-#if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG)
-#ifndef PREPROCESS_XCODE
+#  if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG)
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr, "FILE_DEF_DEBUG and TARGET_DEF_DEBUG inconsistent in C\n");
     result = 0;
   }
-#endif
-#endif
-#if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
+#    endif
+#  endif
+#  if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
   {
     fprintf(stderr, "DEBUG and RELEASE definitions inconsistent in C\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
-#if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE)
-#ifndef PREPROCESS_XCODE
+#  if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE)
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr,
             "FILE_DEF_RELEASE and TARGET_DEF_RELEASE inconsistent in C\n");
     result = 0;
   }
-#endif
-#endif
-#if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
+#    endif
+#  endif
+#  if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
   {
     fprintf(stderr, "RELEASE and DEBUG definitions inconsistent in C\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #ifndef FILE_PATH_DEF
   {
diff --git a/Tests/Preprocess/preprocess.cxx b/Tests/Preprocess/preprocess.cxx
index 0fab785254..34a69c6c69 100644
--- a/Tests/Preprocess/preprocess.cxx
+++ b/Tests/Preprocess/preprocess.cxx
@@ -35,118 +35,118 @@ int check_defines_CXX()
     }
   }
 #ifdef NDEBUG
-#ifdef FILE_DEF_DEBUG
+#  ifdef FILE_DEF_DEBUG
   {
     fprintf(stderr, "FILE_DEF_DEBUG should not be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifdef TARGET_DEF_DEBUG
+#  endif
+#  ifdef TARGET_DEF_DEBUG
   {
     fprintf(stderr, "TARGET_DEF_DEBUG should not be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifdef DIRECTORY_DEF_DEBUG
+#  endif
+#  ifdef DIRECTORY_DEF_DEBUG
   {
     fprintf(stderr, "DIRECTORY_DEF_DEBUG should not be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifndef FILE_DEF_RELEASE
-#ifndef PREPROCESS_XCODE
+#  endif
+#  ifndef FILE_DEF_RELEASE
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr, "FILE_DEF_RELEASE should be defined in CXX\n");
     result = 0;
   }
-#endif
-#endif
-#ifndef TARGET_DEF_RELEASE
+#    endif
+#  endif
+#  ifndef TARGET_DEF_RELEASE
   {
     fprintf(stderr, "TARGET_DEF_RELEASE should be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifndef DIRECTORY_DEF_RELEASE
+#  endif
+#  ifndef DIRECTORY_DEF_RELEASE
   {
     fprintf(stderr, "DIRECTORY_DEF_RELEASE should be defined in CXX\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #ifdef PREPROCESS_DEBUG
-#ifndef FILE_DEF_DEBUG
-#ifndef PREPROCESS_XCODE
+#  ifndef FILE_DEF_DEBUG
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr, "FILE_DEF_DEBUG should be defined in CXX\n");
     result = 0;
   }
-#endif
-#endif
-#ifndef TARGET_DEF_DEBUG
+#    endif
+#  endif
+#  ifndef TARGET_DEF_DEBUG
   {
     fprintf(stderr, "TARGET_DEF_DEBUG should be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifndef DIRECTORY_DEF_DEBUG
+#  endif
+#  ifndef DIRECTORY_DEF_DEBUG
   {
     fprintf(stderr, "DIRECTORY_DEF_DEBUG should be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifdef FILE_DEF_RELEASE
+#  endif
+#  ifdef FILE_DEF_RELEASE
   {
     fprintf(stderr, "FILE_DEF_RELEASE should not be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifdef TARGET_DEF_RELEASE
+#  endif
+#  ifdef TARGET_DEF_RELEASE
   {
     fprintf(stderr, "TARGET_DEF_RELEASE should not be defined in CXX\n");
     result = 0;
   }
-#endif
-#ifdef DIRECTORY_DEF_RELEASE
+#  endif
+#  ifdef DIRECTORY_DEF_RELEASE
   {
     fprintf(stderr, "DIRECTORY_DEF_RELEASE should not be defined in CXX\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
-#if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG)
-#ifndef PREPROCESS_XCODE
+#  if !defined(FILE_DEF_DEBUG) || !defined(TARGET_DEF_DEBUG)
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr,
             "FILE_DEF_DEBUG and TARGET_DEF_DEBUG inconsistent in CXX\n");
     result = 0;
   }
-#endif
-#endif
-#if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
+#    endif
+#  endif
+#  if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
   {
     fprintf(stderr, "DEBUG and RELEASE definitions inconsistent in CXX\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #if defined(FILE_DEF_RELEASE) || defined(TARGET_DEF_RELEASE)
-#if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE)
-#ifndef PREPROCESS_XCODE
+#  if !defined(FILE_DEF_RELEASE) || !defined(TARGET_DEF_RELEASE)
+#    ifndef PREPROCESS_XCODE
   {
     fprintf(stderr,
             "FILE_DEF_RELEASE and TARGET_DEF_RELEASE inconsistent in CXX\n");
     result = 0;
   }
-#endif
-#endif
-#if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
+#    endif
+#  endif
+#  if defined(FILE_DEF_DEBUG) || defined(TARGET_DEF_DEBUG)
   {
     fprintf(stderr, "RELEASE and DEBUG definitions inconsistent in CXX\n");
     result = 0;
   }
-#endif
+#  endif
 #endif
 #ifndef FILE_PATH_DEF
   {