From 822a537d2e26bca7e11b1276f0b9ffaf016a91ac Mon Sep 17 00:00:00 2001 From: jsalling Date: Mon, 8 Feb 2016 16:53:10 -0600 Subject: [PATCH] Remove opaque typedef from UnityFixture struct, as done in core Unity --- extras/fixture/src/unity_fixture.c | 2 +- extras/fixture/src/unity_fixture_internals.h | 4 ++-- extras/fixture/test/unity_fixture_Test.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index f9479bc..cdcf382 100644 --- 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" -UNITY_FIXTURE_T UnityFixture; +struct _UnityFixture UnityFixture; //If you decide to use the function pointer approach. //Build with -D UNITY_OUTPUT_CHAR=outputChar and include diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h index f2625ab..6594736 100644 --- a/extras/fixture/src/unity_fixture_internals.h +++ b/extras/fixture/src/unity_fixture_internals.h @@ -8,13 +8,13 @@ #ifndef UNITY_FIXTURE_INTERNALS_H_ #define UNITY_FIXTURE_INTERNALS_H_ -typedef struct _UNITY_FIXTURE_T +struct _UnityFixture { int Verbose; unsigned int RepeatCount; const char* NameFilter; const char* GroupFilter; -} UNITY_FIXTURE_T; +}; 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 index f1df378..0527fbe 100644 --- a/extras/fixture/test/unity_fixture_Test.c +++ b/extras/fixture/test/unity_fixture_Test.c @@ -10,7 +10,7 @@ #include #include -extern UNITY_FIXTURE_T UnityFixture; +extern struct _UnityFixture UnityFixture; TEST_GROUP(UnityFixture);