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
commit25e98e815a776c647838b35efa68f9b125f7c7ef (patch)
tree1416a33b7bf1cc3e2907c998a4094973ab43f628
parenta58400edd335889ae0db86a8ccececf952ab5939 (diff)
downloadxfsprogs-dev-25e98e815a776c647838b35efa68f9b125f7c7ef.tar.gz
libfrog: move convert.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--include/input.h2
-rw-r--r--libfrog/Makefile1
-rw-r--r--libfrog/convert.h (renamed from include/convert.h)6
3 files changed, 5 insertions, 4 deletions
diff --git a/include/input.h b/include/input.h
index 6d8dbcc420..57fdd34396 100644
--- a/include/input.h
+++ b/include/input.h
@@ -10,7 +10,7 @@
#include <grp.h>
#include <sys/types.h>
#include "project.h"
-#include "convert.h"
+#include "libfrog/convert.h"
#include <stdbool.h>
extern char **breakline(char *input, int *count);
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 2b199b4539..5ba32a221f 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -31,6 +31,7 @@ HFILES = \
avl64.h \
bulkstat.h \
bitmap.h \
+convert.h \
crc32defs.h \
crc32table.h \
topology.h
diff --git a/include/convert.h b/libfrog/convert.h
index 0489a1db1c..321540aa63 100644
--- a/include/convert.h
+++ b/libfrog/convert.h
@@ -3,8 +3,8 @@
* Copyright (c) 2000-2005 Silicon Graphics, Inc.
* All Rights Reserved.
*/
-#ifndef __CONVERT_H__
-#define __CONVERT_H__
+#ifndef __LIBFROG_CONVERT_H__
+#define __LIBFROG_CONVERT_H__
extern int64_t cvt_s64(char *s, int base);
extern int32_t cvt_s32(char *s, int base);
@@ -22,4 +22,4 @@ extern uid_t uid_from_string(char *user);
extern gid_t gid_from_string(char *group);
extern prid_t prid_from_string(char *project);
-#endif /* __CONVERT_H__ */
+#endif /* __LIBFROG_CONVERT_H__ */