From: Stefan Weil <weil@mail.berlios.de>
Date: Sun, 28 Mar 2010 09:44:41 +0000 (+0200)
Subject: Fix compilation with missing inotify_init1
X-Git-Tag: TizenStudio_2.0_p2.3~5185
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=501c80f8ba6c89f6aa89c0c409ac201bb782611b;p=sdk%2Femulator%2Fqemu.git

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>
---

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 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         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);