diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-27 01:26:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-27 13:25:58 +0100 |
| commit | 872a590ef83b23a65071242a8082d25d5efa6db6 (patch) | |
| tree | c4a7eec4c52124dc7b32d8fe698e3d04387147f4 | |
| parent | util-lib: split out printf() helpers to stdio-util.h (diff) | |
| download | systemd-872a590ef83b23a65071242a8082d25d5efa6db6.tar.xz systemd-872a590ef83b23a65071242a8082d25d5efa6db6.zip | |
stat-util.h: move F_TYPE_EQUAL() macro definition to stat-util.h
| -rw-r--r-- | src/basic/btrfs-util.c | 1 | ||||
| -rw-r--r-- | src/basic/cgroup-util.c | 3 | ||||
| -rw-r--r-- | src/basic/macro.h | 6 | ||||
| -rw-r--r-- | src/basic/stat-util.h | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c index 7b49a1a516..7457e9f218 100644 --- a/src/basic/btrfs-util.c +++ b/src/basic/btrfs-util.c @@ -36,6 +36,7 @@ #include "path-util.h" #include "selinux-util.h" #include "smack-util.h" +#include "stat-util.h" #include "string-util.h" #include "util.h" diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index cfbeab7411..0f0e144b5e 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -41,15 +41,16 @@ #include "mkdir.h" #include "parse-util.h" #include "path-util.h" +#include "proc-cmdline.h" #include "process-util.h" #include "set.h" #include "special.h" +#include "stat-util.h" #include "string-table.h" #include "string-util.h" #include "unit-name.h" #include "user-util.h" #include "util.h" -#include "proc-cmdline.h" int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) { _cleanup_free_ char *fs = NULL; diff --git a/src/basic/macro.h b/src/basic/macro.h index acd67feabb..975714da2b 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -301,12 +301,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { #define char_array_0(x) x[sizeof(x)-1] = 0; - /* Because statfs.t_type can be int on some architectures, we have to cast - * the const magic to the type, otherwise the compiler warns about - * signed/unsigned comparison, because the magic can be 32 bit unsigned. - */ -#define F_TYPE_EQUAL(a, b) (a == (typeof(a)) b) - /* Returns the number of chars needed to format variables of the * specified type as a decimal string. Adds in extra space for a * negative '-' prefix (hence works correctly on signed diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h index cb00e0f564..82edea06a8 100644 --- a/src/basic/stat-util.h +++ b/src/basic/stat-util.h @@ -61,3 +61,9 @@ int path_check_fstype(const char *path, statfs_f_type_t magic_value); bool is_temporary_fs(const struct statfs *s) _pure_; int fd_is_temporary_fs(int fd); + +/* Because statfs.t_type can be int on some architectures, we have to cast + * the const magic to the type, otherwise the compiler warns about + * signed/unsigned comparison, because the magic can be 32 bit unsigned. + */ +#define F_TYPE_EQUAL(a, b) (a == (typeof(a)) b) |