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
This commit is contained in:
jsalling
2016-04-24 12:14:44 -05:00
parent 25a3666e47
commit 573481729b
3 changed files with 3 additions and 13 deletions

View File

@ -7,11 +7,6 @@
#include "unity.h" #include "unity.h"
#include <stddef.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_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; longjmp(Unity.AbortFrame, 1); }
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 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 /// return prematurely if we are already in failure or ignore state

View File

@ -291,12 +291,9 @@ typedef UNITY_DOUBLE_TYPE _UD;
//Default to using putchar, which is defined in stdio.h //Default to using putchar, which is defined in stdio.h
#include <stdio.h> #include <stdio.h>
#define UNITY_OUTPUT_CHAR(a) putchar(a) #define UNITY_OUTPUT_CHAR(a) putchar(a)
// We need to flag the output char function uses putc in #else
// unity.c the extern function is not declared then. //If defined as something else, make sure we declare it here so it's ready for use
// Previously the extern was declared in this header but extern int UNITY_OUTPUT_CHAR(int);
// when redundant function declaration compiler flag is enabled
// it wont compile.
#define UNITY_OUTPUT_CHAR_USE_PUTC
#endif #endif
#ifndef UNITY_PRINT_EOL #ifndef UNITY_PRINT_EOL

View File

@ -8,8 +8,6 @@
#include "unity.h" #include "unity.h"
#include <string.h> #include <string.h>
int putcharSpy(int c);
// Dividing by these constants produces +/- infinity. // Dividing by these constants produces +/- infinity.
// The rationale is given in UnityAssertFloatIsInf's body. // The rationale is given in UnityAssertFloatIsInf's body.
#ifndef UNITY_EXCLUDE_FLOAT #ifndef UNITY_EXCLUDE_FLOAT