espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-25 03:52:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

UNITY_OUTPUT_CHAR can emit a redundant declaration, we scope the extern declartion to the unity.c

Browse Source
This commit is contained in:
Jerry Jacobs
2016-04-13 12:19:04 +02:00
parent 8c37d7b98a
commit a27b03c79a
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/unity.c
View File

@ -7,6 +7,11 @@
#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

9
src/unity_internals.h
View File

@ -291,9 +291,12 @@ 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)
#else // We need to flag the output char function uses putc in
//If defined as something else, make sure we declare it here so it's ready for use // unity.c the extern function is not declared then.
extern int UNITY_OUTPUT_CHAR(int); // 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
#endif #endif
#ifndef UNITY_PRINT_EOL #ifndef UNITY_PRINT_EOL