aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 13:50:32 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-17 13:50:32 +0000
commit8690e42010a645dfede7779be2d3013bfc453966 (patch)
tree33c67f203932e6a9a6518a8181b4d2fcc383a135
parent8c0ab41f4abdd2e7f47a5cf54a242573e09b96e2 (diff)
linux-user: fix inotify syscalls
Configure test was broken, so the breakage of the #ifdef'd code was not noticed. Signed-off-by: Riku Voipio <riku.voipio@iki.fi> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7134 c046a42c-6fe2-441c-8c8c-71466251a162
-rwxr-xr-xconfigure2
-rw-r--r--linux-user/syscall.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 4035bfcf0..af357132c 100755
--- a/configure
+++ b/configure
@@ -1195,7 +1195,7 @@ int
main(void)
{
/* try to start inotify */
- return inotify_init(void);
+ return inotify_init();
}
EOF
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ec04170b9..b6dc6ccfa 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -486,6 +486,7 @@ _syscall4(int,sys_utimensat,int,dirfd,const char *,pathname,
#endif /* CONFIG_ATFILE */
#ifdef CONFIG_INOTIFY
+#include <sys/inotify.h>
#if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)
static int sys_inotify_init(void)
@@ -502,7 +503,7 @@ static int sys_inotify_add_watch(int fd,const char *pathname, int32_t mask)
#if defined(TARGET_NR_inotify_rm_watch) && defined(__NR_inotify_rm_watch)
static int sys_inotify_rm_watch(int fd, int32_t wd)
{
- return (inotify_rm_watch(fd,pathname, wd));
+ return (inotify_rm_watch(fd, wd));
}
#endif
#else