From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nvp32-0000zA-H5 for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:44:48 -0400 Received: from [140.186.70.92] (port=38402 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nvp30-0000yk-TG for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:44:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nvp2z-00041P-7F for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:44:46 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:65179) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nvp2y-00041B-Q3 for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:44:45 -0400 From: Stefan Weil Date: Sun, 28 Mar 2010 11:44:41 +0200 Message-Id: <1269769481-7438-1-git-send-email-weil@mail.berlios.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] Fix compilation with missing inotify_init1 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Riku Voipio , Aurelien Jarno 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 Cc: Aurelien Jarno Signed-off-by: Stefan Weil --- linux-user/syscall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 29c9c09..aa3cbb8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7062,11 +7062,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); -- 1.7.0