summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Noonan <snoonan@amazon.com>2014-01-09 21:55:07 (GMT)
committerYury Usishchev <y.usishchev@samsung.com>2014-12-10 11:51:42 (GMT)
commitceed19848b9addb506552e374f010d24c01f3f67 (patch)
tree456f78917aeb2ded6dc2de8f6be4a813af855844
parent12c6a19c8f0faabca2cdc37cf100d5bc26e64040 (diff)
downloadqemu-ceed19848b9addb506552e374f010d24c01f3f67.zip
qemu-ceed19848b9addb506552e374f010d24c01f3f67.tar.gz
qemu-ceed19848b9addb506552e374f010d24c01f3f67.tar.bz2
virtfs-proxy-helper.c: fix compile error
This is caused by a linux/xattr.h and sys/xattr.h incompatibility: In file included from /home/snoonan/Development/qemu/include/qemu/xattr.h:27:0, from fsdev/virtfs-proxy-helper.c:25: /usr/include/sys/xattr.h:31:3: error: expected identifier before numeric constant XATTR_CREATE = 1, /* set value, fail if attr already exists. */ ^ /home/snoonan/Development/qemu/qemu/rules.mak:25: recipe for target 'fsdev/virtfs-proxy-helper.o' failed Moving the include around resolves it. Change-Id: I8242070c18a511e62877d57564a7ad754a8f14c8 Signed-off-by: Steven Noonan <snoonan@amazon.com> Cc: Anthony Liguori <aliguori@amazon.com>
-rw-r--r--fsdev/virtfs-proxy-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index 7d7aa67..ed1dfbf 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -19,7 +19,6 @@ typedef unsigned long long __u64;
#include <sys/resource.h>
#include <getopt.h>
#include <syslog.h>
-#include <sys/capability.h>
#include <sys/fsuid.h>
#include <sys/vfs.h>
#include <sys/ioctl.h>
@@ -30,6 +29,7 @@ typedef unsigned long long __u64;
#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/xattr.h"
+#include <sys/capability.h>
#include "virtio-9p-marshal.h"
#include "hw/9pfs/virtio-9p-proxy.h"
#include "fsdev/virtio-9p-marshal.h"