From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSoq5-0006si-T9 for qemu-devel@nongnu.org; Fri, 11 May 2012 08:21:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSopz-00060H-C4 for qemu-devel@nongnu.org; Fri, 11 May 2012 08:20:53 -0400 Received: from smtp.citrix.com ([66.165.176.89]:50964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSopz-000602-7X for qemu-devel@nongnu.org; Fri, 11 May 2012 08:20:47 -0400 From: Roger Pau Monne Date: Fri, 11 May 2012 13:20:34 +0100 Message-ID: <1336738834-27814-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] audio: fix bug in mixeng_template.h build on NetBSD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Roger Pau Monne This is a bug fix for rc1, although I think this bug has been present for a long time. NetBSD has typedefs and defines of types, so all the types specified in mixeng.c IN_T define (int8_t, uint8_t...) got expanded to __int8_t, __uint8_t, and the construction of types in mixeng_template.h failed. audio/mixeng.c:150:17: error: 'conv_natural_uint8_t_to_mono' undeclared here (not in a function) [...] audio/mixeng_template.h:114:1: warning: 'conv_natural___uint8_t_to_mono' defined but not used [...] Undef those types, so we can safely compile. This is safe even if the types are not defined. Cc: Vassili Karpov (malc) Signed-off-by: Roger Pau Monne --- audio/mixeng_template.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index e644c23..33e6b61 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -27,6 +27,18 @@ * dec++'ified by Dscho */ +/* + * Remove definitions of types, to prevent expansion in "glue" macro. + * This is needed at least for NetBSD, but any operating system that + * has those defines will probably cause trouble. + */ +#undef int8_t +#undef uint8_t +#undef int16_t +#undef uint16_t +#undef int32_t +#undef uint32_t + #ifndef SIGNED #define HALF (IN_MAX >> 1) #endif -- 1.7.7.5 (Apple Git-26)