The next commit will add a new "human-size.h" header copied in from
nbdkit.  This breaks existing code that uses common/utils/human-size.h
(which we will combine later).

As a temporary hack to maintain bisection, make sure we are using the
deprecated "human-size.h" header.  This hack will be removed later.
---
 copy/main.c | 2 +-
 info/show.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/copy/main.c b/copy/main.c
index 6928a4acde..d2f415dc47 100644
--- a/copy/main.c
+++ b/copy/main.c
@@ -39,7 +39,7 @@
 #include <libnbd.h>
 
 #include "ispowerof2.h"
-#include "human-size.h"
+#include "../utils/human-size.h"
 #include "minmax.h"
 #include "version.h"
 #include "nbdcopy.h"
diff --git a/info/show.c b/info/show.c
index 920bbb0a27..99b7b5b60a 100644
--- a/info/show.c
+++ b/info/show.c
@@ -29,7 +29,7 @@
 #include <libnbd.h>
 
 #include "ansi-colours.h"
-#include "human-size.h"
+#include "../utils/human-size.h"
 #include "string-vector.h"
 
 #include "nbdinfo.h"
-- 
2.41.0

_______________________________________________
Libguestfs mailing list
Libguestfs@redhat.com
https://listman.redhat.com/mailman/listinfo/libguestfs

Reply via email to