aboutsummaryrefslogtreecommitdiff
path: root/linux-user/strace.c
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@iki.fi>2009-06-18 22:51:31 +0300
committermalc <av1474@comtv.ru>2009-06-19 02:51:47 +0400
commit03dfe9f871871921c03c3c65ff69c68759186994 (patch)
treee60fdcdfda452fde99c00f3a1d49a1ceb45f6087 /linux-user/strace.c
parent5d928867920e27d61d581710aac3a167c9e86e4f (diff)
downloadqemu-03dfe9f871871921c03c3c65ff69c68759186994.zip
qemu-03dfe9f871871921c03c3c65ff69c68759186994.tar.gz
qemu-03dfe9f871871921c03c3c65ff69c68759186994.tar.bz2
linux-user: strace now handles guest stringscorrectly [v2]
On Tue, Jun 16, 2009 at 08:19:23PM -0500, Anthony Liguori wrote: > malc wrote: >> >> On my system the above line causes gcc to emit: >> >> In file included from /home/malc/x/rcs/git/qemu/linux-user/strace.c:12: >> /usr/include/linux/futex.h:48: error: field `__user' has incomplete type >> /usr/include/linux/futex.h:48: error: syntax error before '*' token >> /usr/include/linux/futex.h:63: error: field `list' has incomplete type >> /usr/include/linux/futex.h:83: error: field `__user' has incomplete type >> /usr/include/linux/futex.h:83: error: syntax error before '*' token >> make[1]: *** [strace.o] Error 1 > We had the same problem with usb-linux.c. It's broken system headers, > the __user stuff is supposed to get removed as part of the headers > installation. > It builds fine on my system (Fedora 10). Howabout something like this: commit eb8387cb0eda32a18880664eb5f0ca5c8bf05b45 Author: Riku Voipio <riku.voipio@iki.fi> Date: Thu Jun 18 22:44:31 2009 +0300 Subject: linux-user: include futex defines directly Since some common distributions have broken linux/futex.h, stop including it. Instead add the defines directly. Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Diffstat (limited to 'linux-user/strace.c')
-rw-r--r--linux-user/strace.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 5ea9acb..6090dcc 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -8,7 +8,6 @@
#include <sys/types.h>
#include <sys/mount.h>
#include <sys/mman.h>
-#include <linux/futex.h>
#include <unistd.h>
#include "qemu.h"