]>
Commit | Line | Data |
---|---|---|
4e8ae6f9 JB |
1 | Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict: |
2 | When including both, the latter must be included first. | |
3 | Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front, | |
4 | before <sys/capability.h> (which includes <linux/xattr.h>. | |
5 | ||
8806a92d JB |
6 | --- qemu-7.2.10/fsdev/virtfs-proxy-helper.c.orig 2024-03-25 22:16:49.552502269 +0100 |
7 | +++ qemu-7.2.10/fsdev/virtfs-proxy-helper.c 2024-03-25 22:36:50.349330328 +0100 | |
a3dcf5ff | 8 | @@ -10,6 +10,7 @@ |
4e8ae6f9 JB |
9 | */ |
10 | ||
a3dcf5ff | 11 | #include "qemu/osdep.h" |
4e8ae6f9 | 12 | +#include "qemu/xattr.h" |
8806a92d | 13 | #include <glib/gstdio.h> |
4e8ae6f9 JB |
14 | #include <sys/resource.h> |
15 | #include <getopt.h> | |
8806a92d | 16 | @@ -23,7 +24,6 @@ |
b5882bc5 | 17 | #endif |
5bfaccb7 | 18 | #include <cap-ng.h> |
4e8ae6f9 JB |
19 | #include "qemu/sockets.h" |
20 | -#include "qemu/xattr.h" | |
a3dcf5ff AM |
21 | #include "9p-iov-marshal.h" |
22 | #include "hw/9pfs/9p-proxy.h" | |
8806a92d | 23 | #include "hw/9pfs/9p-util.h" |