espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-08-06 13:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #182, remove redundant function declarations

Browse Source
This commit is contained in:
Jerry Jacobs
2016-04-13 11:33:57 +02:00
parent 64d98f240a
commit 8c37d7b98a
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unity.c
View File

@ -67,9 +67,6 @@ const _U_UINT UnitySizeMask[] =
#endif #endif
}; };
void UnityPrintFail(void);
void UnityPrintOk(void);
//----------------------------------------------- //-----------------------------------------------
// Pretty Printers & Test Result Output Handlers // Pretty Printers & Test Result Output Handlers
//----------------------------------------------- //-----------------------------------------------
@ -1261,8 +1258,6 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
//----------------------------------------------- //-----------------------------------------------
#if defined(UNITY_WEAK_ATTRIBUTE) #if defined(UNITY_WEAK_ATTRIBUTE)
void setUp(void);
void tearDown(void);
UNITY_WEAK_ATTRIBUTE void setUp(void) { } UNITY_WEAK_ATTRIBUTE void setUp(void) { }
UNITY_WEAK_ATTRIBUTE void tearDown(void) { } UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
#elif defined(UNITY_WEAK_PRAGMA) #elif defined(UNITY_WEAK_PRAGMA)
@ -1270,9 +1265,6 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
void setUp(void) { } void setUp(void) { }
# pragma weak tearDown # pragma weak tearDown
void tearDown(void) { } void tearDown(void) { }
#else
void setUp(void);
void tearDown(void);
#endif #endif
//----------------------------------------------- //-----------------------------------------------
void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum) void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)

2
test/Makefile
View File

@ -3,7 +3,7 @@ ifeq ($(shell uname -s), Darwin)
CC = clang CC = clang
endif endif
#DEBUG = -O0 -g #DEBUG = -O0 -g
CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -Wredundant-decls
CFLAGS += $(DEBUG) CFLAGS += $(DEBUG)
DEFINES = -D UNITY_OUTPUT_CHAR=putcharSpy -D UNITY_INCLUDE_DOUBLE DEFINES = -D UNITY_OUTPUT_CHAR=putcharSpy -D UNITY_INCLUDE_DOUBLE
SRC = ../src/unity.c tests/testunity.c build/testunityRunner.c SRC = ../src/unity.c tests/testunity.c build/testunityRunner.c