From c4f0537c0c1901158d6a35a43f2d664e7240c71b Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Sun, 27 May 2012 21:54:53 +0000 Subject: [PATCH] - changed the default handling to always include stdint unless told to exclude it. git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@140 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- src/unity_internals.h | 9 +++------ targets/gcc.yml | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 0f4c90a..2a2dfa8 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -10,12 +10,12 @@ #include #include -//Limits.h is often automatically included. +//stdint.h is often automatically included. //Unity uses it to guess at the sizes of integer types, etc. #ifdef UNITY_USE_LIMITS_H #include #endif -#ifdef UNITY_USE_STDINT_H +#ifndef UNITY_EXCLUDE_STDINT_H #include #endif @@ -111,10 +111,7 @@ typedef _UU64 _U_UINT; typedef _US64 _U_SINT; #endif - -#ifndef UINTPTR_MAX -#error "OH SHITSTICKS!" -#endif + //------------------------------------------------------- // Pointer Support //------------------------------------------------------- diff --git a/targets/gcc.yml b/targets/gcc.yml index fc3841b..f3072e0 100644 --- a/targets/gcc.yml +++ b/targets/gcc.yml @@ -20,8 +20,7 @@ compiler: items: - UNITY_SUPPORT_64 - UNITY_INCLUDE_DOUBLE - - UNITY_SUPPORT_TEST_CASES - - UNITY_USE_STDINT_H + - UNITY_SUPPORT_TEST_CASES object_files: prefix: '-o' extension: '.o'