From a28853871d6ef5ec4afe810a43fdde859dfdaa7e Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 18 May 2012 12:08:14 +0100 Subject: audio: split IN_T into two separate constants Split IN_T into BSIZE and ITYPE, to avoid expansion if the OS has defined macros for the intX_t and uintX_t types. The IN_T constant is then defined in mixeng_template.h so it can be used by the functions/macros on this header file. This change has been tested successfully under Debian Linux and NetBSD 6.0BETA. Cc: Vassili Karpov (malc) Signed-off-by: Roger Pau Monne Signed-off-by: malc --- audio/mixeng_template.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'audio/mixeng_template.h') diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index e644c231ad..30849a62a1 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -31,7 +31,8 @@ #define HALF (IN_MAX >> 1) #endif -#define ET glue (ENDIAN_CONVERSION, glue (_, IN_T)) +#define ET glue (ENDIAN_CONVERSION, glue (glue (glue (_, ITYPE), BSIZE), _t)) +#define IN_T glue (glue (ITYPE, BSIZE), _t) #ifdef FLOAT_MIXENG static mixeng_real inline glue (conv_, ET) (IN_T v) @@ -150,3 +151,4 @@ static void glue (glue (clip_, ET), _from_mono) #undef ET #undef HALF +#undef IN_T -- cgit v1.2.1