commit a1606b0baaed1be23a6d8b90036290e1610b8dd0
author Stefan Weil <weil@mail.berlios.de> Sun Mar 28 11:44:41 2010 +0200
committer Aurelien Jarno <aurelien@aurel32.net> Thu Apr 01 21:51:59 2010 +0200
tree 6c7c77b91d8447fd8933c9d8d72b677316a0c3c5
parent 0104dcacf374cb9ceff078e9470cc0cc5bb7c8ec

Fix compilation with missing inotify_init1

Commit c05c7a7306a23a4b01d1606172b142c45caffc92
breaks cross compilation for mips (and other
compilations without CONFIG_INOTIFY1):

make[1]: Entering directory `/qemu/bin/mips'
  CC    i386-linux-user/syscall.o
cc1: warnings being treated as errors
/qemu/linux-user/syscall.c: In function ‘do_syscall’:
/qemu/linux-user/syscall.c:7067: error: implicit declaration of function ‘sys_inotify_init1’

Cc: Riku Voipio <riku.voipio@nokia.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5640ba6..a03e432 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7068,11 +7068,13 @@
         ret = get_errno(sys_inotify_init());
         break;
 #endif
+#ifdef CONFIG_INOTIFY1
 #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1)
     case TARGET_NR_inotify_init1:
         ret = get_errno(sys_inotify_init1(arg1));
         break;
 #endif
+#endif
 #if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch)
     case TARGET_NR_inotify_add_watch:
         p = lock_user_string(arg2);