From 776ea69091d6c4de4e0aedc2f4758041dd8b22a5 Mon Sep 17 00:00:00 2001
From: ?ukasz Plewa <lukasz.plewa@intel.com>
Date: Wed, 23 Mar 2022 18:08:57 +0100
Subject: [PATCH] common: change daxctl include

switch from include <ndctl/libdaxctl.h> to include<daxctl/libdaxctl.h>
in old ndctl version this file is available in both directories.
In newer it's not available in daxctl dir.
---
 src/libpmem2/badblocks_ndctl.c        | 4 ++--
 src/libpmem2/region_namespace_ndctl.c | 4 ++--
 src/libpmem2/usc_ndctl.c              | 4 ++--
 src/tools/daxio/daxio.c               | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libpmem2/badblocks_ndctl.c b/src/libpmem2/badblocks_ndctl.c
index 9a5910bba..d9e988d46 100644
--- a/src/libpmem2/badblocks_ndctl.c
+++ b/src/libpmem2/badblocks_ndctl.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2017-2021, Intel Corporation */
+/* Copyright 2017-2022, Intel Corporation */
 
 /*
  * badblocks_ndctl.c -- implementation of DIMMs API based on the ndctl library
@@ -16,7 +16,7 @@
 #include <sys/sysmacros.h>
 #include <fcntl.h>
 #include <ndctl/libndctl.h>
-#include <ndctl/libdaxctl.h>
+#include <daxctl/libdaxctl.h>
 
 #include "libpmem2.h"
 #include "pmem2_utils.h"
diff --git a/src/libpmem2/region_namespace_ndctl.c b/src/libpmem2/region_namespace_ndctl.c
index 1383796a9..dfdec34de 100644
--- a/src/libpmem2/region_namespace_ndctl.c
+++ b/src/libpmem2/region_namespace_ndctl.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2022, Intel Corporation */
 
 /*
  * region_namespace_ndctl.c -- common ndctl functions
  */
 
 #include <ndctl/libndctl.h>
-#include <ndctl/libdaxctl.h>
+#include <daxctl/libdaxctl.h>
 #include <sys/sysmacros.h>
 #include <fcntl.h>
 
diff --git a/src/libpmem2/usc_ndctl.c b/src/libpmem2/usc_ndctl.c
index be63e879b..db658c7e1 100644
--- a/src/libpmem2/usc_ndctl.c
+++ b/src/libpmem2/usc_ndctl.c
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2022, Intel Corporation */
 
 /*
  * usc_ndctl.c -- pmem2 usc function for platforms using ndctl
  */
 #include <ndctl/libndctl.h>
-#include <ndctl/libdaxctl.h>
+#include <daxctl/libdaxctl.h>
 #include <sys/types.h>
 #include <sys/sysmacros.h>
 #include <fcntl.h>
diff --git a/src/tools/daxio/daxio.c b/src/tools/daxio/daxio.c
index 66cd0b7ae..3aa152f9e 100644
--- a/src/tools/daxio/daxio.c
+++ b/src/tools/daxio/daxio.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2022, Intel Corporation */
 
 /*
  * daxio.c -- simple app for reading and writing data from/to
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include <ndctl/libndctl.h>
-#include <ndctl/libdaxctl.h>
+#include <daxctl/libdaxctl.h>
 #include <libpmem.h>
 
 #include "util.h"
-- 
GitLab