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

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>
---

diff --git a/include/input.h b/include/input.h
index 6d8dbcc42..57fdd3439 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 2b199b453..5ba32a221 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
similarity index 87%
rename from include/convert.h
rename to libfrog/convert.h
index 0489a1db1..321540aa6 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__ */