All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Cc: Lukasz Plewa <lukasz.plewa@intel.com>
Subject: [ndctl PATCH] libdaxctl: use the same uuid definition as libdaxctl
Date: Mon, 13 Nov 2017 08:40:08 -0800	[thread overview]
Message-ID: <151059120823.1173.7255627659909695931.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)

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 <lukasz.plewa@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 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 <stdarg.h>
 #include <unistd.h>
-#include <uuid.h>
+
+#ifdef HAVE_LIBUUID
+#include <uuid/uuid.h>
+#else
+typedef unsigned char uuid_t[16];
+#endif
 
 #ifdef __cplusplus
 extern "C" {

_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

                 reply	other threads:[~2017-11-13 16:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=151059120823.1173.7255627659909695931.stgit@dwillia2-desk3.amr.corp.intel.com \
    --to=dan.j.williams@intel.com \
    --cc=linux-nvdimm@lists.01.org \
    --cc=lukasz.plewa@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.