Revised internal type naming scheme to better sandbox Unity away from…

… everything else. Sure, short was nice, but not at the expense of naming collisions.
open-vela · Nov 29, 2016 · 8e31f5d · 8e31f5d
1 parent b77c6b8
commit 8e31f5d
Show file tree

Hide file tree

Showing 7 changed files with 399 additions and 399 deletions.
diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c
@@ -9,7 +9,7 @@
 #include "unity_fixture.h"
 #include "unity_internals.h"
 
-struct _UnityFixture UnityFixture;
+struct UNITY_FIXTURE_T UnityFixture;
 
 /* If you decide to use the function pointer approach.
  * Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>

diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h
@@ -13,14 +13,14 @@ extern "C"
 {
 #endif
 
-struct _UnityFixture
+struct UNITY_FIXTURE_T
 {
     int Verbose;
     unsigned int RepeatCount;
     const char* NameFilter;
     const char* GroupFilter;
 };
-extern struct _UnityFixture UnityFixture;
+extern struct UNITY_FIXTURE_T UnityFixture;
 
 typedef void unityfunction(void);
 void UnityTestRunner(unityfunction* setup,

diff --git a/extras/fixture/test/unity_fixture_Test.c b/extras/fixture/test/unity_fixture_Test.c
@@ -138,8 +138,8 @@ TEST(UnityFixture, FreeNULLSafety)
 
 TEST(UnityFixture, ConcludeTestIncrementsFailCount)
 {
-    _U_UINT savedFails = Unity.TestFailures;
-    _U_UINT savedIgnores = Unity.TestIgnores;
+    UNITY_UINT savedFails = Unity.TestFailures;
+    UNITY_UINT savedIgnores = Unity.TestIgnores;
     UnityOutputCharSpy_Enable(1);
     Unity.CurrentTestFailed = 1;
     UnityConcludeFixtureTest(); /* Resets TestFailed for this test to pass */
@@ -301,7 +301,7 @@ TEST(UnityCommandOptions, GroupOrNameFilterWithoutStringFails)
 
 TEST(UnityCommandOptions, GroupFilterReallyFilters)
 {
-    _U_UINT saved = Unity.NumberOfTests;
+    UNITY_UINT saved = Unity.NumberOfTests;
     TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(4, unknownCommand));
     UnityIgnoreTest(NULL, "non-matching", NULL);
     TEST_ASSERT_EQUAL(saved, Unity.NumberOfTests);