summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Noonan <snoonan@amazon.com>2014-01-09 13:55:07 -0800
committerRonan Le Martret <ronan@fridu.net>2014-02-07 09:19:05 +0100
commit15382d5fa1ea8d6e9e5441cead3494c82207c063 (patch)
tree01d6231331168d0bec89de02c5e1bbfca38b66a0
parent7ccdb8880dff22ca0bd4516d9973c55397c08e22 (diff)
downloadqemu-accepted/tizen/generic.tar.gz
qemu-accepted/tizen/generic.tar.bz2
qemu-accepted/tizen/generic.zip
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 b8da77dbe..7659b9359 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"