From patchwork Tue Mar 14 17:38:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9624073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16AC960244 for ; Tue, 14 Mar 2017 17:39:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07C2020564 for ; Tue, 14 Mar 2017 17:39:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0AC92857E; Tue, 14 Mar 2017 17:39:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 7A6E920564 for ; Tue, 14 Mar 2017 17:39:39 +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 1cnqOi-0003ED-Jn; Tue, 14 Mar 2017 17:38:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnqOi-0003DG-2g for xen-devel@lists.xenproject.org; Tue, 14 Mar 2017 17:38:12 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 30/9E-27751-38A28C85; Tue, 14 Mar 2017 17:38:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRWlGSWpSXmKPExsXitHSDvW6z1ok Ig4mtTBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bHxG2sBat5Knad+MLewHiHq4uRk0NCwF9i yqzZ7CA2m4CBxIrpVxm7GDk4RARUJG7vNQAxmQXKJY4e0wWpEBZwllj1v40NxGYRUJX4sqydG cTmFbCTWPf0LTvERHmJRZtmsIDYQgJqEjcWLmOBqBGUODnzCZjNLCAhcfDFC+YJjNyzkKRmIU ktYGRaxahRnFpUllqka2Shl1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kRGAgMQLC D8fzawEOMkhxMSqK8DXyHIoT4kvJTKjMSizPii0pzUosPMcpwcChJ8DokA+UEi1LTUyvSMnOA IQmTluDgURLhDQJJ8xYXJOYWZ6ZDpE4xKkqJ8zqDJARAEhmleXBtsDi4xCgrJczLCHSIEE9Ba lFuZgmq/CtGcQ5GJWFeTZApPJl5JXDTXwEtZgJaPI3vIMjikkSElFQDY93ZlrKvH+MVnd0nvr c36Y36EXim/uIh2ekH5j/7e/bKBpuSbM6buyztz3/uW/DeZ76q3Y1mVv1vj+d6fM9KlP09/+e MwsvSi1jOfW+PUnabpv1fSayYo1zn6tUnsaVisb/FH8mEp/8vF2sMMm1QlgndVVa+J0m9UPpP yLmmFLun/HMvv6wxU2Ipzkg01GIuKk4EAIleSsd+AgAA X-Env-Sender: prvs=239dd90e2=anthony.perard@citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1489513088!54293068!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54667 invoked from network); 14 Mar 2017 17:38:10 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 14 Mar 2017 17:38:10 -0000 X-IronPort-AV: E=Sophos;i="5.36,165,1486425600"; d="scan'208";a="422547446" From: Anthony PERARD To: Date: Tue, 14 Mar 2017 17:38:00 +0000 Message-ID: <20170314173800.23502-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Cc: Anthony PERARD , Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH] tools: Include due to glibc 2.25 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-Virus-Scanned: ClamAV using ClamSMTP To fix the follwing error with glibc 2.25: tap-ctl-allocate.c:109:13: error: In the GNU C Library, "makedev" is defined by . For historical compatibility, it is currently defined by as well, but we plan to remove this soon. To use "makedev", include directly. If you did not intend to use a system-defined macro "makedev", you should undefine it after including . [-Werror] err = mknod(devname, perm, makedev(major, minor)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Same thing with major() and minor() in libxl__device_physdisk_major_minor(). Signed-off-by: Anthony PERARD --- tools/blktap2/control/tap-ctl-allocate.c | 1 + tools/libxl/libxl_internal.h | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/blktap2/control/tap-ctl-allocate.c b/tools/blktap2/control/tap-ctl-allocate.c index 8a6471e987..0f15175cc7 100644 --- a/tools/blktap2/control/tap-ctl-allocate.c +++ b/tools/blktap2/control/tap-ctl-allocate.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "tap-ctl.h" diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5bbede532e..235500dd06 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include