From patchwork Mon Nov 13 16:40:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10056413 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 8F080602A7 for ; Mon, 13 Nov 2017 16:48:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75CEB28EBA for ; Mon, 13 Nov 2017 16:48:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6728229015; Mon, 13 Nov 2017 16:48:25 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0DB5428EBA for ; Mon, 13 Nov 2017 16:48:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C85B7220757C6; Mon, 13 Nov 2017 08:44:17 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C5E1F2203D614 for ; Mon, 13 Nov 2017 08:44:16 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 08:48:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.44,389,1505804400"; d="scan'208"; a="1243530199" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga002.fm.intel.com with ESMTP; 13 Nov 2017 08:48:22 -0800 Subject: [ndctl PATCH] libdaxctl: use the same uuid definition as libdaxctl From: Dan Williams To: linux-nvdimm@lists.01.org Date: Mon, 13 Nov 2017 08:40:08 -0800 Message-ID: <151059120823.1173.7255627659909695931.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lukasz Plewa Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP libdaxtl inadvertently included the uuid-devel version of the uuid.h header rather than the libuuid header. Fix this up to avoid type conflicts for applications that include both libdaxctl.h and libndctl.h. Reported-by: Lukasz Plewa Signed-off-by: Dan Williams --- daxctl/libdaxctl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/daxctl/libdaxctl.h b/daxctl/libdaxctl.h index 77f6a25d2e30..21bc376ce629 100644 --- a/daxctl/libdaxctl.h +++ b/daxctl/libdaxctl.h @@ -15,7 +15,12 @@ #include #include -#include + +#ifdef HAVE_LIBUUID +#include +#else +typedef unsigned char uuid_t[16]; +#endif #ifdef __cplusplus extern "C" {