authorgravatar for hugo.beauzee@datadoghq.comHugo Beauzée-Luyssen <hugo.beauzee@datadoghq.com> 2025-02-05 14:23:00+01:00
committergravatar for hugo.beauzee@datadoghq.comHugo Beauzée-Luyssen <hugo.beauzee@datadoghq.com> 2025-02-06 18:00:43+01:00
loge716d135557106410cdd46f01b865eaab3938fd5
treeab035f21b8867fd6a93348e3b9ef84d45ebfe1cd
parent5d2584e53ebefa2727b880ad62e148e016f9860b
signaturebadge-check Signed by SSH key SHA256:f/PN3KBuYCphTMxWTpJsH2vSjX3SRGCBksBuY/gCq10

generic glibc: guard definitions of functions introduced in 2.36

1 files changed, 9 insertions(+), 1 deletions(-)

  • folderlib
lib/libc/include/generic-glibc/sys/mount.h+9-1
...@@ -235,6 +235,8 @@ struct mount_attr...@@ -235,6 +235,8 @@ struct mount_attr
235#define FSPICK_NO_AUTOMOUNT 0x00000004235#define FSPICK_NO_AUTOMOUNT 0x00000004
236#define FSPICK_EMPTY_PATH 0x00000008236#define FSPICK_EMPTY_PATH 0x00000008
237237
238// zig patch: check target glibc version
239#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 36) || __GLIBC__ > 2
238240
239#ifndef FSOPEN_CLOEXEC241#ifndef FSOPEN_CLOEXEC
240/* The type of fsconfig call made. */242/* The type of fsconfig call made. */
...@@ -268,6 +270,7 @@ enum fsconfig_command...@@ -268,6 +270,7 @@ enum fsconfig_command
268#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */270#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */
269#define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */271#define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */
270272
273#endif
271274
272__BEGIN_DECLS275__BEGIN_DECLS
273276
...@@ -282,6 +285,9 @@ extern int umount (const char *__special_file) __THROW;...@@ -282,6 +285,9 @@ extern int umount (const char *__special_file) __THROW;
282/* Unmount a filesystem. Force unmounting if FLAGS is set to MNT_FORCE. */285/* Unmount a filesystem. Force unmounting if FLAGS is set to MNT_FORCE. */
283extern int umount2 (const char *__special_file, int __flags) __THROW;286extern int umount2 (const char *__special_file, int __flags) __THROW;
284287
288// zig patch: check target glibc version
289#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 36) || __GLIBC__ > 2
290
285/* Open the filesystem referenced by FS_NAME so it can be configured for291/* Open the filesystem referenced by FS_NAME so it can be configured for
286 mouting. */292 mouting. */
287extern int fsopen (const char *__fs_name, unsigned int __flags) __THROW;293extern int fsopen (const char *__fs_name, unsigned int __flags) __THROW;
...@@ -320,6 +326,8 @@ extern int mount_setattr (int __dfd, const char *__path, unsigned int __flags,...@@ -320,6 +326,8 @@ extern int mount_setattr (int __dfd, const char *__path, unsigned int __flags,
320 struct mount_attr *__uattr, size_t __usize)326 struct mount_attr *__uattr, size_t __usize)
321 __THROW;327 __THROW;
322328
329#endif /* (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 36) || __GLIBC__ > 2 */
330
323__END_DECLS331__END_DECLS
324332
325#endif /* _SYS_MOUNT_H */
\ No newline at end of file
333#endif /* _SYS_MOUNT_H */