From patchwork Sat Oct 26 09:31:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 286268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6B0372C00A2 for ; Sat, 26 Oct 2013 20:39:15 +1100 (EST) Received: from localhost ([::1]:34085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Va0Kv-0006IP-0M for incoming@patchwork.ozlabs.org; Sat, 26 Oct 2013 05:39:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Va0KR-0006Hu-Gd for qemu-devel@nongnu.org; Sat, 26 Oct 2013 05:38:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Va0KN-00014a-0a for qemu-devel@nongnu.org; Sat, 26 Oct 2013 05:38:43 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:36506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Va0KM-00014F-Pe; Sat, 26 Oct 2013 05:38:38 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 93DBE4390F; Sat, 26 Oct 2013 13:38:37 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 52E50530; Sat, 26 Oct 2013 13:32:28 +0400 (MSK) Received: (nullmailer pid 19653 invoked by uid 1000); Sat, 26 Oct 2013 09:32:27 -0000 From: Michael Tokarev To: Anthony Liguori Date: Sat, 26 Oct 2013 13:31:27 +0400 Message-Id: <1382779887-15971-8-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , qemu-devel@nongnu.org, Alex Bligh Subject: [Qemu-devel] [PULL 7/7] audio/mixeng_template.h: fix inline declaration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Alex Bligh Fix error: ‘inline’ is not at beginning of declaration [-Werror=old-style-declaration] Signed-off-by: Alex Bligh Signed-off-by: Michael Tokarev --- audio/mixeng_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index 30849a6..77cc89b 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -35,7 +35,7 @@ #define IN_T glue (glue (ITYPE, BSIZE), _t) #ifdef FLOAT_MIXENG -static mixeng_real inline glue (conv_, ET) (IN_T v) +static inline mixeng_real glue (conv_, ET) (IN_T v) { IN_T nv = ENDIAN_CONVERT (v); @@ -54,7 +54,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) #endif } -static IN_T inline glue (clip_, ET) (mixeng_real v) +static inline IN_T glue (clip_, ET) (mixeng_real v) { if (v >= 0.5) { return IN_MAX;