11 files changed, 40 insertions, 34 deletions
diff --git a/Tests/ObjectLibrary/A/a.h b/Tests/ObjectLibrary/A/a.h
index 7259f982ed..b1fd42fac3 100644
--- a/Tests/ObjectLibrary/A/a.h
+++ b/Tests/ObjectLibrary/A/a.h
@@ -1,6 +1,6 @@
 #ifndef A_DEF
-# error "A_DEF not defined"
+#error "A_DEF not defined"
 #endif
 #ifdef B_DEF
-# error "B_DEF must not be defined"
+#error "B_DEF must not be defined"
 #endif
diff --git a/Tests/ObjectLibrary/A/a2.c b/Tests/ObjectLibrary/A/a2.c
index d8f225eb7a..fbb0c02448 100644
--- a/Tests/ObjectLibrary/A/a2.c
+++ b/Tests/ObjectLibrary/A/a2.c
@@ -1,2 +1,5 @@
 #include "a.h"
-int a2(void) { return 0; }
+int a2(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/B/b.h b/Tests/ObjectLibrary/B/b.h
index 3489c71052..a7bd352302 100644
--- a/Tests/ObjectLibrary/B/b.h
+++ b/Tests/ObjectLibrary/B/b.h
@@ -1,18 +1,18 @@
 #ifdef A_DEF
-# error "A_DEF must not be defined"
+#error "A_DEF must not be defined"
 #endif
 #ifndef B_DEF
-# error "B_DEF not defined"
+#error "B_DEF not defined"
 #endif
 
 #if defined(_WIN32) && defined(Bexport)
-# define EXPORT_B __declspec(dllexport)
+#define EXPORT_B __declspec(dllexport)
 #else
-# define EXPORT_B
+#define EXPORT_B
 #endif
 
 #if defined(_WIN32) && defined(SHARED_B)
-# define IMPORT_B __declspec(dllimport)
+#define IMPORT_B __declspec(dllimport)
 #else
-# define IMPORT_B
+#define IMPORT_B
 #endif
diff --git a/Tests/ObjectLibrary/B/b1.c b/Tests/ObjectLibrary/B/b1.c
index fdeffe491d..d804d43019 100644
--- a/Tests/ObjectLibrary/B/b1.c
+++ b/Tests/ObjectLibrary/B/b1.c
@@ -1,2 +1,5 @@
 #include "b.h"
-EXPORT_B int b1(void) { return 0; }
+EXPORT_B int b1(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/B/b2.c b/Tests/ObjectLibrary/B/b2.c
index 6e0d17cbe0..4615b544b4 100644
--- a/Tests/ObjectLibrary/B/b2.c
+++ b/Tests/ObjectLibrary/B/b2.c
@@ -1,2 +1,5 @@
 #include "b.h"
-EXPORT_B int b2(void) { return 0; }
+EXPORT_B int b2(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/ExportLanguages/a.c b/Tests/ObjectLibrary/ExportLanguages/a.c
index af20d3ff65..16363033da 100644
--- a/Tests/ObjectLibrary/ExportLanguages/a.c
+++ b/Tests/ObjectLibrary/ExportLanguages/a.c
@@ -1 +1,4 @@
-int a(void) { return 0; }
+int a(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/ExportLanguages/a.cxx b/Tests/ObjectLibrary/ExportLanguages/a.cxx
index ae9c87c496..c661b94db9 100644
--- a/Tests/ObjectLibrary/ExportLanguages/a.cxx
+++ b/Tests/ObjectLibrary/ExportLanguages/a.cxx
@@ -1 +1,4 @@
-extern "C" int acxx(void) { return 0; }
+extern "C" int acxx(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/c.c b/Tests/ObjectLibrary/c.c
index 968095b8b8..4c37e38b24 100644
--- a/Tests/ObjectLibrary/c.c
+++ b/Tests/ObjectLibrary/c.c
@@ -1,7 +1,7 @@
 #if defined(_WIN32) && defined(Cshared_EXPORTS)
-# define EXPORT_C __declspec(dllexport)
+#define EXPORT_C __declspec(dllexport)
 #else
-# define EXPORT_C
+#define EXPORT_C
 #endif
 
 extern int a1(void);
@@ -10,10 +10,5 @@ extern int b1(void);
 extern int b2(void);
 EXPORT_C int c(void)
 {
-  return 0
-    + a1()
-    + a2()
-    + b1()
-    + b2()
-    ;
+  return 0 + a1() + a2() + b1() + b2();
 }
diff --git a/Tests/ObjectLibrary/dummy.c b/Tests/ObjectLibrary/dummy.c
index 2b17d816d6..3983c6abae 100644
--- a/Tests/ObjectLibrary/dummy.c
+++ b/Tests/ObjectLibrary/dummy.c
@@ -1 +1,4 @@
-int dummy(void) {return 0;}
+int dummy(void)
+{
+  return 0;
+}
diff --git a/Tests/ObjectLibrary/main.c b/Tests/ObjectLibrary/main.c
index 6819f1c6d7..b2f1d44bd3 100644
--- a/Tests/ObjectLibrary/main.c
+++ b/Tests/ObjectLibrary/main.c
@@ -1,16 +1,12 @@
 #if defined(_WIN32) && defined(SHARED_C)
-# define IMPORT_C __declspec(dllimport)
+#define IMPORT_C __declspec(dllimport)
 #else
-# define IMPORT_C
+#define IMPORT_C
 #endif
 extern IMPORT_C int b1(void);
 extern IMPORT_C int b2(void);
 extern IMPORT_C int c(void);
 int main(void)
 {
-  return 0
-    + c()
-    + b1()
-    + b2()
-    ;
+  return 0 + c() + b1() + b2();
 }
diff --git a/Tests/ObjectLibrary/mainAB.c b/Tests/ObjectLibrary/mainAB.c
index 38db20520e..a7aa393174 100644
--- a/Tests/ObjectLibrary/mainAB.c
+++ b/Tests/ObjectLibrary/mainAB.c
@@ -11,10 +11,7 @@ int main(void)
 {
   return 0
 #ifndef NO_A
-    + a1()
-    + a2()
+    + a1() + a2()
 #endif
-    + b1()
-    + b2()
-    ;
+    + b1() + b2();
 }