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

redirect UNITY_POINTER_WIDTH to define at last catchable moment. Update older gcc targets to be fully explicit.

Browse Source
This commit is contained in:
Mark VanderVoord
2014-07-29 13:42:15 -04:00
parent 16e560147c
commit b5050c6ed3
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/unity_internals.h
View File

@ -30,7 +30,7 @@
#define ULONG_MAX (sizeof(unsigned long) * 256 - 1) #define ULONG_MAX (sizeof(unsigned long) * 256 - 1)
#endif #endif
#ifndef UINTPTR_MAX #ifndef UINTPTR_MAX
#define UINTPTR_MAX ULONG_MAX //apparently this is not a constant expression: (sizeof(unsigned int *) * 256 - 1) //apparently this is not a constant expression: (sizeof(unsigned int *) * 256 - 1) so we have to just let this fall through
#endif #endif
#endif #endif
//------------------------------------------------------- //-------------------------------------------------------
@ -100,7 +100,7 @@
#endif #endif
#endif #endif
#ifndef UNITY_POINTER_WIDTH #ifndef UNITY_POINTER_WIDTH
#define UNITY_POINTER_WIDTH (32) #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
#endif #endif
//------------------------------------------------------- //-------------------------------------------------------

2
targets/gcc_32.yml
View File

@ -24,6 +24,8 @@ compiler:
- UNITY_EXCLUDE_SIZEOF - UNITY_EXCLUDE_SIZEOF
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_INT_WIDTH=32
- UNITY_LONG_WIDTH=32
object_files: object_files:
prefix: '-o' prefix: '-o'
extension: '.o' extension: '.o'

2
targets/gcc_64.yml
View File

@ -25,6 +25,8 @@ compiler:
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64
- UNITY_INT_WIDTH=32
- UNITY_LONG_WIDTH=64
object_files: object_files:
prefix: '-o' prefix: '-o'
extension: '.o' extension: '.o'