virtfs-proxy-helper.c: fix compile error 23/16123/1 accepted/tizen/generic accepted/tizen/ivi/stable accepted/tizen_3.0.2014.q3_common accepted/tizen_3.0.m14.3_ivi accepted/tizen_generic accepted/tizen_ivi_panda accepted/tizen_ivi_release tizen_3.0.2014.q3_common tizen_3.0.m14.2_ivi tizen_3.0.m14.3_ivi tizen_ivi_panda tizen_ivi_release accepted/tizen/generic/20140207.095458 accepted/tizen/generic/20140312.123108 accepted/tizen/ivi/20140208.002155 accepted/tizen/ivi/panda/20140312.121016 accepted/tizen/ivi/panda/20140403.014142 accepted/tizen/ivi/panda/20140408.211306 accepted/tizen/ivi/release/20140312.123556 accepted/tizen/mobile/20140227.070453 submit/tizen/20140207.095509 submit/tizen/20140312.070911 submit/tizen_ivi_panda/20140403.012104 submit/tizen_ivi_panda/20140408.211720 submit/tizen_ivi_release/20140312.071342 tizen_3.0.2014.q3_common_release tizen_3.0.m14.2_ivi_release tizen_3.0.m14.3_ivi_release
authorSteven Noonan <snoonan@amazon.com>
Thu, 9 Jan 2014 21:55:07 +0000 (13:55 -0800)
committerRonan Le Martret <ronan@fridu.net>
Fri, 7 Feb 2014 08:19:05 +0000 (09:19 +0100)
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>
fsdev/virtfs-proxy-helper.c

index b8da77d..7659b93 100644 (file)
@@ -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"