diff --git a/examples/unity_config.h b/examples/unity_config.h index 45c1018..744be9c 100644 --- a/examples/unity_config.h +++ b/examples/unity_config.h @@ -1,5 +1,6 @@ /* Unity Configuration * As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529 + * Update: August 25th, 2016 * See Also: Unity/docs/UnityConfigurationGuide.pdf * * Unity is designed to run on almost anything that is targeted by a C compiler. @@ -53,31 +54,22 @@ extern "C" * automatically. **************************************************************************** */ -/* The first thing that Unity does to guess your types is check `stdint.h`. This - * file includes defines like `UINT_MAX` that Unity can make use of to learn a - * lot about your system. It's possible you don't want it to do this or it's +/* The first attempt to guess your types is to check `limits.h`. Some compilers + * that don't support `stdint.h` could include `limits.h`. If you don't + * 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, * 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. */ /* #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 *********************** * 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 diff --git a/src/unity.h b/src/unity.h index 1fd5486..031ccc9 100644 --- a/src/unity.h +++ b/src/unity.h @@ -27,12 +27,11 @@ void tearDown(void); * - Unity attempts to automatically discover your integer sizes * - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in * - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in - * - 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: * - define UNITY_SUPPORT_64 - * - define UNITY_INT_WIDTH - * - UNITY_LONG_WIDTH - * - UNITY_POINTER_WIDTH + * - set UNITY_INT_WIDTH + * - set UNITY_LONG_WIDTH + * - set UNITY_POINTER_WIDTH * Floats * - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons diff --git a/src/unity_internals.h b/src/unity_internals.h index 7edf3f8..5526973 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -34,7 +34,7 @@ * 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 * at this stage in the translation of the C program. * Therefore, infer it from UINT_MAX if possible. */ @@ -440,7 +440,7 @@ void UnityPrintFloat(const _UF number); #endif /*------------------------------------------------------- - * Test Assertion Fuctions + * Test Assertion Functions *------------------------------------------------------- * Use the macros below this section instead of calling * these directly. The macros have a consistent naming diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index e1acaa0..ec1165d 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -22,7 +22,6 @@ compiler: items: - UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_LIMITS_H - - UNITY_EXCLUDE_SIZEOF - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_INT_WIDTH=32 diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index 78e0f77..0e273de 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -22,7 +22,6 @@ compiler: items: - UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_LIMITS_H - - UNITY_EXCLUDE_SIZEOF - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_64