From patchwork Sun Apr 17 22:36:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 8863971 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 779619F1C1 for ; Sun, 17 Apr 2016 22:38:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9802D2017D for ; Sun, 17 Apr 2016 22:38:15 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9B102013A for ; Sun, 17 Apr 2016 22:38:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1arvHj-0008NE-Ml; Sun, 17 Apr 2016 22:35:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1arvHi-0008N8-M3 for xen-devel@lists.xenproject.org; Sun, 17 Apr 2016 22:35:18 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 5D/42-03098-5AF04175; Sun, 17 Apr 2016 22:35:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXitHRDpO4SfpF wg9bpihbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b5e3YFG4Urfr99xNrAuF+gi5GTQ0LAX+Lk wgZmEJtNQFniZ2cvG4gtIqAn0XTgOSOIzSzgJfFi3T8wW1jASOL48QNgNouAqsTFa5/A6nkFn CVOn+5nh5gpJ3H++E+wmUICChId048xQdQISpyc+YQFYqaExMEXL5gh6rklbp+eyjyBkWcWkr JZSMoWMDKtYlQvTi0qSy3SNdRLKspMzyjJTczM0TU0MNbLTS0uTkxPzUlMKtZLzs/dxAgMEAY g2MG4/KPTIUZJDiYlUd7OAsFwIb6k/JTKjMTijPii0pzU4kOMMhwcShK8U/lEwoUEi1LTUyvS MnOAoQqTluDgURLhrQdJ8xYXJOYWZ6ZDpE4xKkqJ804GSQiAJDJK8+DaYPFxiVFWSpiXEegQI Z6C1KLczBJU+VeM4hyMSsK8M0Gm8GTmlcBNfwW0mAlosfUbQZDFJYkIKakGxmUlc2akHbG9+u CU7ttJRpmvzx6R1v+ydbvZ1C2t33ky1rQdtPvilrS3lCv247QEy4vnXG41eSibF01fJmmwc18 t+wymx5MUBA4JJgY69X+6dlmc69VOEw+uMtbaCja/YM4PviKuZ5XZ+HpDZ4pMzpgwu7uU8++f rSssTiXpi3LWah4Mvslup8RSnJFoqMVcVJwIAJ1OV8uKAgAA X-Env-Sender: prvs=908078bea=wei.liu2@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1460932515!35274286!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49610 invoked from network); 17 Apr 2016 22:35:16 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 17 Apr 2016 22:35:16 -0000 X-IronPort-AV: E=Sophos;i="5.24,499,1454976000"; d="scan'208";a="347835268" From: Wei Liu To: Xen-devel Date: Sun, 17 Apr 2016 23:36:53 +0100 Message-ID: <1460932613-10522-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH] libxl: fix old style declarations X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix errors like: /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst, ^ /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] /local/work/xen.git/dist/install/usr/local/include/libxl.h:1233:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] int static inline libxl_domain_create_restore_0x040200( ^ Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Cc: Ian Jackson --- tools/libxl/libxl.h | 4 ++-- tools/libxl/libxl_uuid.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 3fc5c48..8ff5f31 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1230,7 +1230,7 @@ int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, #if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040400 -int static inline libxl_domain_create_restore_0x040200( +static inline int libxl_domain_create_restore_0x040200( libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_asyncop_how *ao_how, @@ -1254,7 +1254,7 @@ int static inline libxl_domain_create_restore_0x040200( #elif defined(LIBXL_API_VERSION) && LIBXL_API_VERSION >= 0x040400 \ && LIBXL_API_VERSION < 0x040700 -int static inline libxl_domain_create_restore_0x040400( +static inline int libxl_domain_create_restore_0x040400( libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_domain_restore_params *params, diff --git a/tools/libxl/libxl_uuid.h b/tools/libxl/libxl_uuid.h index 994320d..17c8b97 100644 --- a/tools/libxl/libxl_uuid.h +++ b/tools/libxl/libxl_uuid.h @@ -56,7 +56,7 @@ int libxl_uuid_from_string(libxl_uuid *uuid, const char *in); void libxl_uuid_copy(libxl_ctx *ctx_opt, libxl_uuid *dst, const libxl_uuid *src); #if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst, +static inline void libxl_uuid_copy_0x040400(libxl_uuid *dst, const libxl_uuid *src) { libxl_uuid_copy(NULL, dst, src);