From 5682780f4d48ac33348860947bd509f80dda2a9e Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Mon, 14 Oct 2019 07:11:06 +0100 Subject: [PATCH] CMSIS-DSP: Moved definition of Q31,Q15 and Q7 bounds to arm_math.h --- Include/arm_helium_utils.h | 8 -------- Include/arm_math.h | 14 +++++++++++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Include/arm_helium_utils.h b/Include/arm_helium_utils.h index 8076b7d2..bbde9593 100755 --- a/Include/arm_helium_utils.h +++ b/Include/arm_helium_utils.h @@ -79,14 +79,6 @@ Definitions available for MVEI only ***************************************/ #if defined (ARM_MATH_HELIUM) || defined(ARM_MATH_MVEI) -#include - -#define Q31_MAX LONG_MAX -#define Q15_MAX SHRT_MAX -#define Q7_MAX SCHAR_MAX -#define Q31_MIN LONG_MIN -#define Q15_MIN SHRT_MIN -#define Q7_MIN SCHAR_MIN #include "arm_common_tables.h" diff --git a/Include/arm_math.h b/Include/arm_math.h index 15c22bfa..e9cdd35c 100644 --- a/Include/arm_math.h +++ b/Include/arm_math.h @@ -377,9 +377,17 @@ extern "C" -#include "string.h" -#include "math.h" -#include "float.h" +#include +#include +#include +#include + +#define Q31_MAX LONG_MAX +#define Q15_MAX SHRT_MAX +#define Q7_MAX SCHAR_MAX +#define Q31_MIN LONG_MIN +#define Q15_MIN SHRT_MIN +#define Q7_MIN SCHAR_MIN /* evaluate ARM DSP feature */ #if (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1))