From 573481729b4f93c7cbb3d6ccf9d1e8b1c607b58c Mon Sep 17 00:00:00 2001
From: jsalling <jsalling@users.noreply.github.com>
Date: Sun, 24 Apr 2016 12:14:44 -0500
Subject: [PATCH] Revert commits 720ea42 and a27b03c which broke the Fixture
 build  These were aimed at preventing the internals header from declaring   a
 prototype for 'int UNITY_OUTPUT_CHAR(int);'. The second part fixed   an
 omitted declaration in the tests caused by the first commit.  Will replace
 the default behavior & add an option for this in next commit

---
 src/unity.c            | 5 -----
 src/unity_internals.h  | 9 +++------
 test/tests/testunity.c | 2 --
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/unity.c b/src/unity.c
index 8541274..b398b3f 100644
--- a/src/unity.c
+++ b/src/unity.c
@@ -7,11 +7,6 @@
 #include "unity.h"
 #include <stddef.h>
 
-#ifndef UNITY_OUTPUT_CHAR_USE_PUTC
-//If defined as something else, make sure we declare it here so it's ready for use
-extern int UNITY_OUTPUT_CHAR(int);
-#endif
-
 #define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; longjmp(Unity.AbortFrame, 1); }
 #define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
 /// return prematurely if we are already in failure or ignore state
diff --git a/src/unity_internals.h b/src/unity_internals.h
index 81058be..6549656 100644
--- a/src/unity_internals.h
+++ b/src/unity_internals.h
@@ -291,12 +291,9 @@ typedef UNITY_DOUBLE_TYPE _UD;
 //Default to using putchar, which is defined in stdio.h
 #include <stdio.h>
 #define UNITY_OUTPUT_CHAR(a) putchar(a)
-// We need to flag the output char function uses putc in
-//  unity.c the extern function is not declared then.
-// Previously the extern was declared in this header but
-//  when redundant function declaration compiler flag is enabled
-//  it wont compile.
-#define UNITY_OUTPUT_CHAR_USE_PUTC
+#else
+//If defined as something else, make sure we declare it here so it's ready for use
+extern int UNITY_OUTPUT_CHAR(int);
 #endif
 
 #ifndef UNITY_PRINT_EOL
diff --git a/test/tests/testunity.c b/test/tests/testunity.c
index 77eeb21..9fae64e 100644
--- a/test/tests/testunity.c
+++ b/test/tests/testunity.c
@@ -8,8 +8,6 @@
 #include "unity.h"
 #include <string.h>
 
-int putcharSpy(int c);
-
 // Dividing by these constants produces +/- infinity.
 // The rationale is given in UnityAssertFloatIsInf's body.
 #ifndef UNITY_EXCLUDE_FLOAT
-- 
GitLab