提交 28c94bd4 编写于 作者: J jsalling

Remove references to UNITY_EXCLUDE_SIZEOF, rework config header

上级 9aa4c7f1
/* Unity Configuration /* Unity Configuration
* As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529 * As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529
* Update: August 25th, 2016
* See Also: Unity/docs/UnityConfigurationGuide.pdf * See Also: Unity/docs/UnityConfigurationGuide.pdf
* *
* Unity is designed to run on almost anything that is targeted by a C compiler. * Unity is designed to run on almost anything that is targeted by a C compiler.
...@@ -53,31 +54,22 @@ extern "C" ...@@ -53,31 +54,22 @@ extern "C"
* automatically. * automatically.
**************************************************************************** */ **************************************************************************** */
/* The first thing that Unity does to guess your types is check `stdint.h`. This /* The first attempt to guess your types is to check `limits.h`. Some compilers
* file includes defines like `UINT_MAX` that Unity can make use of to learn a * that don't support `stdint.h` could include `limits.h`. If you don't
* lot about your system. It's possible you don't want it to do this or it's * want Unity to check this file, define this to make it skip the inclusion.
* Unity looks at UINT_MAX & ULONG_MAX, which were available since C89.
*/
/* #define UNITY_EXCLUDE_LIMITS_H */
/* The second thing that Unity does to guess your types is check `stdint.h`.
* This file defines `UINTPTR_MAX`, since C99, that Unity can make use of to
* learn about your system. It's possible you don't want it to do this or it's
* possible that your system doesn't support `stdint.h`. If that's the case, * possible that your system doesn't support `stdint.h`. If that's the case,
* you're going to want to define this. That way, Unity will know to skip the * you're going to want to define this. That way, Unity will know to skip the
* inclusion of this file and you won't be left with a compiler error. * inclusion of this file and you won't be left with a compiler error.
*/ */
/* #define UNITY_EXCLUDE_STDINT_H */ /* #define UNITY_EXCLUDE_STDINT_H */
/* The second attempt to guess your types is to check `limits.h`. Some compilers
* that don't support `stdint.h` could include `limits.h` instead. If you don't
* want Unity to check this file either, define this to make it skip the
* inclusion.
*/
/* #define UNITY_EXCLUDE_LIMITS_H */
/* The third and final attempt to guess your types is to use the `sizeof()`
* operator. Even if the first two options don't work, this one covers most
* cases. There _is_ a rare compiler or two out there that doesn't support
* `sizeof()` in the preprocessing stage, though. For these, you have the
* ability to disable this feature as well.
*/
/* #define UNITY_EXCLUDE_SIZEOF */
/* ********************** MANUAL INTEGER TYPE DEFINITION *********************** /* ********************** MANUAL INTEGER TYPE DEFINITION ***********************
* If you've disabled all of the automatic options above, you're going to have * If you've disabled all of the automatic options above, you're going to have
* to do the configuration yourself. There are just a handful of defines that * to do the configuration yourself. There are just a handful of defines that
......
...@@ -27,12 +27,11 @@ void tearDown(void); ...@@ -27,12 +27,11 @@ void tearDown(void);
* - Unity attempts to automatically discover your integer sizes * - Unity attempts to automatically discover your integer sizes
* - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h> * - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h>
* - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h> * - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h>
* - define UNITY_EXCLUDE_SIZEOF to stop attempting to use sizeof in macros
* - If you cannot use the automatic methods above, you can force Unity by using these options: * - If you cannot use the automatic methods above, you can force Unity by using these options:
* - define UNITY_SUPPORT_64 * - define UNITY_SUPPORT_64
* - define UNITY_INT_WIDTH * - set UNITY_INT_WIDTH
* - UNITY_LONG_WIDTH * - set UNITY_LONG_WIDTH
* - UNITY_POINTER_WIDTH * - set UNITY_POINTER_WIDTH
* Floats * Floats
* - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons * - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* Guess Widths If Not Specified * Guess Widths If Not Specified
*-------------------------------------------------------*/ *-------------------------------------------------------*/
/* Determine the size of an int, if not already specificied. /* Determine the size of an int, if not already specified.
* We cannot use sizeof(int), because it is not yet defined * We cannot use sizeof(int), because it is not yet defined
* at this stage in the translation of the C program. * at this stage in the translation of the C program.
* Therefore, infer it from UINT_MAX if possible. */ * Therefore, infer it from UINT_MAX if possible. */
...@@ -440,7 +440,7 @@ void UnityPrintFloat(const _UF number); ...@@ -440,7 +440,7 @@ void UnityPrintFloat(const _UF number);
#endif #endif
/*------------------------------------------------------- /*-------------------------------------------------------
* Test Assertion Fuctions * Test Assertion Functions
*------------------------------------------------------- *-------------------------------------------------------
* Use the macros below this section instead of calling * Use the macros below this section instead of calling
* these directly. The macros have a consistent naming * these directly. The macros have a consistent naming
......
...@@ -22,7 +22,6 @@ compiler: ...@@ -22,7 +22,6 @@ compiler:
items: items:
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_LIMITS_H
- UNITY_EXCLUDE_SIZEOF
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_INT_WIDTH=32 - UNITY_INT_WIDTH=32
......
...@@ -22,7 +22,6 @@ compiler: ...@@ -22,7 +22,6 @@ compiler:
items: items:
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_LIMITS_H
- UNITY_EXCLUDE_SIZEOF
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册