diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-09-09 15:37:07 -0400 |
|---|---|---|
| committer | Eric Sandeen <sandeen@redhat.com> | 2019-09-09 15:37:07 -0400 |
| commit | 59f1f2a6e01da728a7491c6309763858d10b3ea8 (patch) | |
| tree | 0d366b60fecf84ec328b03d3a082fdb41c6538c2 | |
| parent | 42b4c8e87a9d9e3d52477507222835db912c5603 (diff) | |
| download | xfsprogs-dev-59f1f2a6e01da728a7491c6309763858d10b3ea8.tar.gz | |
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>
| -rw-r--r-- | include/Makefile | 1 | ||||
| -rw-r--r-- | include/input.h | 2 | ||||
| -rw-r--r-- | libfrog/Makefile | 1 | ||||
| -rw-r--r-- | libfrog/paths.c | 2 | ||||
| -rw-r--r-- | libfrog/projects.c | 2 | ||||
| -rw-r--r-- | libfrog/projects.h (renamed from include/project.h) | 6 | ||||
| -rw-r--r-- | quota/quota.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/include/Makefile b/include/Makefile index fc90bc4832..a80867e402 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 57fdd34396..3c3fa1161e 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 f8f7de68c1..25b5a03cd2 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 f0f4548ee4..327372237d 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 91bc78f242..dbde97021c 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 index 3577dadb54..779194749e 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 5db0a74197..025d887726 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> /* |