aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-09-09 15:37:06 -0400
committerEric Sandeen <sandeen@redhat.com>2019-09-09 15:37:06 -0400
commitb4a09f896d35e0883ebcf394aef0b97d9ae96eb7 (patch)
treea90d7f08bf859ed97f6fda4636b53112ce227d98
parent7478c2e3699b7a4d93d7b146ab12c5e54a9030e5 (diff)
downloadxfsprogs-dev-b4a09f896d35e0883ebcf394aef0b97d9ae96eb7.tar.gz
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>
-rw-r--r--libfrog/Makefile1
-rw-r--r--libfrog/avl64.h (renamed from include/avl64.h)6
-rw-r--r--repair/incore_ext.c2
-rw-r--r--repair/xfs_repair.c2
-rw-r--r--scrub/phase1.c2
5 files changed, 7 insertions, 6 deletions
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 3797602978..e766adba94 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
index 4042f6c3cb..283fc91c68 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 e7ef9eb234..7292f5dcc4 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 e414c4fb41..d7e70dd0c7 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 81b0990dce..6d1cbe25c6 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"