From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 27 Jun 2025 14:03:10 +0000 (+0200)
Subject: basic/include: trivial cleanups for libc header wrapper (#37937)
X-Git-Tag: v258-rc1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77de0a0e2661dd090ae3e6bf48ffae26f4b52516;p=thirdparty%2Fsystemd.git

basic/include: trivial cleanups for libc header wrapper (#37937)
---

77de0a0e2661dd090ae3e6bf48ffae26f4b52516
diff --cc src/basic/include/sys/mount.h
index b28895c9abb,9e7d3d74f1b..211a552d6a3
--- a/src/basic/include/sys/mount.h
+++ b/src/basic/include/sys/mount.h
@@@ -11,8 -10,15 +11,14 @@@
  #include <unistd.h>
  
  #include "missing_fcntl.h"
 -#include "missing_fs.h"
  #include "missing_syscall_def.h"
  
+ /* Since glibc-2.37 (774058d72942249f71d74e7f2b639f77184160a6), sys/mount.h includes linux/mount.h, and
+  * we can safely include both headers in the same source file. However, we cannot do that with older glibc.
+  * To avoid conflicts, let's not use glibc's sys/mount.h, and provide our own minimal implementation.
+  * Fortunately, most of definitions we need are covered by linux/fs.h and linux/mount.h, so only one enum
+  * and a few function prototypes need to be defined here. */
+ 
  /* Possible value for FLAGS parameter of `umount2'.  */
  enum
  {