| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | # From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and |
| 2 | # <sys/mount.h> (included from glibc) are no longer compatible: |
| 3 | # https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | Signed-off-by: Armin Kuster <akuster808@gmail.com> |
| 7 | |
| 8 | Index: cryptmount-5.3.3/cryptmount.c |
| 9 | =================================================================== |
| 10 | --- cryptmount-5.3.3.orig/cryptmount.c |
| 11 | +++ cryptmount-5.3.3/cryptmount.c |
| 12 | @@ -41,7 +41,6 @@ |
| 13 | #ifdef HAVE_SYSLOG |
| 14 | # include <syslog.h> |
| 15 | #endif |
| 16 | -#include <linux/fs.h> /* Beware ordering conflict with sys/mount.h */ |
| 17 | |
| 18 | |
| 19 | #include "armour.h" |