Merge remote-tracking branch 'stefanha/block' into staging

[qemu.git] / audio / mixeng_template.h

diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h
index e644c231ada9e762f7262471b494cfb7893dfa1b..30849a62a1370b1c506ece4c0a3ecd42add245d8 100644 (file)
--- 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