From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 9 Sep 2019 19:37:06 +0000 (-0400)
Subject: libfrog: move avl64.h to libfrog/
X-Git-Tag: v5.3.0-rc2~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4a09f896d35e0883ebcf394aef0b97d9ae96eb7;p=thirdparty%2Fxfsprogs-dev.git

libfrog: move avl64.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libfrog/Makefile b/libfrog/Makefile
index 379760297..e766adba9 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -28,6 +28,7 @@ util.c \
 workqueue.c
 
 HFILES = \
+avl64.h \
 bulkstat.h \
 crc32defs.h \
 crc32table.h \
diff --git a/include/avl64.h b/libfrog/avl64.h
similarity index 96%
rename from include/avl64.h
rename to libfrog/avl64.h
index 4042f6c3c..283fc91c6 100644
--- a/include/avl64.h
+++ b/libfrog/avl64.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef __XR_AVL64_H__
-#define __XR_AVL64_H__
+#ifndef __LIBFROG_AVL64_H__
+#define __LIBFROG_AVL64_H__
 
 #include <sys/types.h>
 
@@ -124,4 +124,4 @@ avl64_findranges(
 #define AVL_EXCLUDE_ZEROLEN	0x0001
 #endif
 
-#endif /* __XR_AVL64_H__ */
+#endif /* __LIBFROG_AVL64_H__ */
diff --git a/repair/incore_ext.c b/repair/incore_ext.c
index e7ef9eb23..7292f5dcc 100644
--- a/repair/incore_ext.c
+++ b/repair/incore_ext.c
@@ -12,7 +12,7 @@
 #include "agheader.h"
 #include "protos.h"
 #include "err_protos.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
 #include "threads.h"
 
 /*
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index e414c4fb4..d7e70dd0c 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -9,7 +9,7 @@
 #include <sys/resource.h>
 #include "xfs_multidisk.h"
 #include "avl.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
 #include "globals.h"
 #include "versions.h"
 #include "agheader.h"
diff --git a/scrub/phase1.c b/scrub/phase1.c
index 81b0990dc..6d1cbe25c 100644
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -19,7 +19,7 @@
 #include "path.h"
 #include "handle.h"
 #include "bitops.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
 #include "list.h"
 #include "xfs_scrub.h"
 #include "common.h"