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

libfrog: move workqueue.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/Makefile b/include/Makefile
index fc90bc483..a80867e40 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -28,7 +28,6 @@ LIBHFILES = libxfs.h \
 	xfs_trans.h \
 	command.h \
 	input.h \
-	project.h \
 	platform_defs.h
 
 HFILES = handle.h \
diff --git a/include/input.h b/include/input.h
index 57fdd3439..3c3fa1161 100644
--- a/include/input.h
+++ b/include/input.h
@@ -9,7 +9,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <sys/types.h>
-#include "project.h"
+#include "libfrog/projects.h"
 #include "libfrog/convert.h"
 #include <stdbool.h>
 
diff --git a/libfrog/Makefile b/libfrog/Makefile
index f8f7de68c..25b5a03cd 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -38,6 +38,7 @@ crc32defs.h \
 crc32table.h \
 fsgeom.h \
 paths.h \
+projects.h \
 ptvar.h \
 radix-tree.h \
 topology.h \
diff --git a/libfrog/paths.c b/libfrog/paths.c
index f0f4548ee..327372237 100644
--- a/libfrog/paths.c
+++ b/libfrog/paths.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "paths.h"
 #include "input.h"
-#include "project.h"
+#include "projects.h"
 #include <limits.h>
 
 extern char *progname;
diff --git a/libfrog/projects.c b/libfrog/projects.c
index 91bc78f24..dbde97021 100644
--- a/libfrog/projects.c
+++ b/libfrog/projects.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "project.h"
+#include "projects.h"
 
 #define PROJID		"/etc/projid"
 #define PROJECT_PATHS	"/etc/projects"
diff --git a/include/project.h b/libfrog/projects.h
similarity index 90%
rename from include/project.h
rename to libfrog/projects.h
index 3577dadb5..779194749 100644
--- a/include/project.h
+++ b/libfrog/projects.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef __PROJECT_H__
-#define __PROJECT_H__
+#ifndef __LIBFROG_PROJECTS_H__
+#define __LIBFROG_PROJECTS_H__
 
 #include "platform_defs.h"
 #include "xfs.h"
@@ -36,4 +36,4 @@ extern void setprfiles(void);
 extern char *projid_file;
 extern char *projects_file;
 
-#endif	/* __PROJECT_H__ */
+#endif	/* __LIBFROG_PROJECTS_H__ */
diff --git a/quota/quota.h b/quota/quota.h
index 5db0a7419..025d88772 100644
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -6,7 +6,7 @@
 
 #include "xqm.h"
 #include "libfrog/paths.h"
-#include "project.h"
+#include "libfrog/projects.h"
 #include <stdbool.h>
 
 /*