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

Modified typedefs in order to avoid collisions

Browse Source 
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@41 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
greg-williams
2009-08-31 03:16:38 +00:00
parent cb1212f9e2
commit 812a71e983
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/unity.h
View File

@ -13,20 +13,20 @@
#if defined(BUS_WIDTH) && (BUS_WIDTH != 32) #if defined(BUS_WIDTH) && (BUS_WIDTH != 32)
#if (BUS_WIDTH == 16) #if (BUS_WIDTH == 16)
typedef unsigned char U8; typedef unsigned char _UU8;
typedef unsigned int U16; typedef unsigned int _UU16;
typedef unsigned long U32; typedef unsigned long _UU32;
typedef signed char S8; typedef signed char _US8;
typedef signed int S16; typedef signed int _US16;
typedef signed long S32; typedef signed long _US32;
#endif #endif
#else #else
typedef unsigned char U8; typedef unsigned char _UU8;
typedef unsigned short U16; typedef unsigned short _UU16;
typedef unsigned int U32; typedef unsigned int _UU32;
typedef signed char S8; typedef signed char _US8;
typedef signed short S16; typedef signed short _US16;
typedef signed int S32; typedef signed int _US32;
#endif #endif
@ -283,13 +283,13 @@ void UnityIgnore(const char* message, const long line);
#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message) \ #define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message) \
Unity.TestFile=__FILE__; \ Unity.TestFile=__FILE__; \
UnityAssertBits(((U32)1 << bit), (-1), (actual), (message), (unsigned short)__LINE__); \ UnityAssertBits(((_UU32)1 << bit), (-1), (actual), (message), (unsigned short)__LINE__); \
ABORT_IF_NECESSARY(); ABORT_IF_NECESSARY();
#define TEST_ASSERT_BIT_HIGH(bit, actual) TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, NULL) #define TEST_ASSERT_BIT_HIGH(bit, actual) TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, NULL)
#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message) \ #define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message) \
Unity.TestFile=__FILE__; \ Unity.TestFile=__FILE__; \
UnityAssertBits(((U32)1 << bit), (0), (actual), (message), (unsigned short)__LINE__); \ UnityAssertBits(((_UU32)1 << bit), (0), (actual), (message), (unsigned short)__LINE__); \
ABORT_IF_NECESSARY(); ABORT_IF_NECESSARY();
#define TEST_ASSERT_BIT_LOW(bit, actual) TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, NULL) #define TEST_ASSERT_BIT_LOW(bit, actual) TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, NULL)

24
test/testunity.c
View File

@ -181,7 +181,7 @@ void testNotEqualBits(void)
void testNotEqualUInts(void) void testNotEqualUInts(void)
{ {
int failed; int failed;
U16 v0, v1; _UU16 v0, v1;
v0 = 9000; v0 = 9000;
v1 = 9001; v1 = 9001;
@ -199,7 +199,7 @@ void testNotEqualUInts(void)
void testNotEqualHex8s(void) void testNotEqualHex8s(void)
{ {
int failed; int failed;
U8 v0, v1; _UU8 v0, v1;
v0 = 0x23; v0 = 0x23;
v1 = 0x22; v1 = 0x22;
@ -217,7 +217,7 @@ void testNotEqualHex8s(void)
void testNotEqualHex16s(void) void testNotEqualHex16s(void)
{ {
int failed; int failed;
U16 v0, v1; _UU16 v0, v1;
v0 = 0x1234; v0 = 0x1234;
v1 = 0x1235; v1 = 0x1235;
@ -235,7 +235,7 @@ void testNotEqualHex16s(void)
void testNotEqualHex32s(void) void testNotEqualHex32s(void)
{ {
int failed; int failed;
U32 v0, v1; _UU32 v0, v1;
v0 = 900000; v0 = 900000;
v1 = 900001; v1 = 900001;
@ -292,8 +292,8 @@ void testEqualUints(void)
void testEqualHex8s(void) void testEqualHex8s(void)
{ {
U8 v0, v1; _UU8 v0, v1;
U8 *p0, *p1; _UU8 *p0, *p1;
v0 = 0x22; v0 = 0x22;
v1 = 0x22; v1 = 0x22;
@ -311,8 +311,8 @@ void testEqualHex8s(void)
void testEqualHex16s(void) void testEqualHex16s(void)
{ {
U16 v0, v1; _UU16 v0, v1;
U16 *p0, *p1; _UU16 *p0, *p1;
v0 = 0x9876; v0 = 0x9876;
v1 = 0x9876; v1 = 0x9876;
@ -330,8 +330,8 @@ void testEqualHex16s(void)
void testEqualHex32s(void) void testEqualHex32s(void)
{ {
U32 v0, v1; _UU32 v0, v1;
U32 *p0, *p1; _UU32 *p0, *p1;
v0 = 0x98765432ul; v0 = 0x98765432ul;
v1 = 0x98765432ul; v1 = 0x98765432ul;
@ -349,8 +349,8 @@ void testEqualHex32s(void)
void testEqualBits(void) void testEqualBits(void)
{ {
U32 v0 = 0xFF55AA00; _UU32 v0 = 0xFF55AA00;
U32 v1 = 0x55550000; _UU32 v1 = 0x55550000;
TEST_ASSERT_BITS(v1, v0, 0x55550000); TEST_ASSERT_BITS(v1, v0, 0x55550000);
TEST_ASSERT_BITS(v1, v0, 0xFF55CC00); TEST_ASSERT_BITS(v1, v0, 0xFF55CC00);