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.pl...@intel.com>
Signed-off-by: Dan Williams <dan.j.willi...@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
