Prep v234: Apply missing upstream fixes in src/basic (1/6)

[elogind.git] / src / basic / stat-util.h

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 48f8e5d8ae3c9cef9d07fb7bfc46b393ec71b29b..c74d1d58e042c1286519bf1e28a9d8d5ee2d2376 100644 (file)
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -57,12 +57,11 @@ int path_is_read_only_fs(const char *path);
 int path_is_os_tree(const char *path);
 #endif // 0
 
-int files_same(const char *filea, const char *fileb);
+int files_same(const char *filea, const char *fileb, int flags);
 
 /* The .f_type field of struct statfs is really weird defined on
- * different archs. Let's use our own type we know is sufficiently
- * larger to store the possible values. */
-typedef long statfs_f_type_t;
+ * different archs. Let's give its type a name. */
+typedef typeof(((struct statfs*)NULL)->f_type) statfs_f_type_t;
 
 bool is_fs_type(const struct statfs *s, statfs_f_type_t magic_value) _pure_;
 #if 0 /// UNNEEDED by elogind
@@ -71,7 +70,10 @@ int path_check_fstype(const char *path, statfs_f_type_t magic_value);
 #endif // 0
 
 bool is_temporary_fs(const struct statfs *s) _pure_;
+#if 0 /// UNNEEDED by elogind
 int fd_is_temporary_fs(int fd);
+int path_is_temporary_fs(const char *path);
+#endif // 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