From 11cf4e80748af05dd6c8f1d30609a5485bf28372 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Nov 2016 19:26:23 +0100 Subject: fixup gcc warnings Remove following warning from common code: warning: ISO C90 forbids mixed declarations and code --- libc/sysdeps/linux/common/ioctl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libc/sysdeps/linux/common/ioctl.c') diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c index 9a00e614a..374b6247b 100644 --- a/libc/sysdeps/linux/common/ioctl.c +++ b/libc/sysdeps/linux/common/ioctl.c @@ -20,6 +20,9 @@ int ioctl(int fd, unsigned long int request, ...) { void *arg; va_list list; +#ifdef __NEW_THREADS + int oldtype, result; +#endif va_start(list, request); arg = va_arg(list, void *); @@ -28,8 +31,8 @@ int ioctl(int fd, unsigned long int request, ...) if (SINGLE_THREAD_P) return __syscall_ioctl(fd, request, arg); #ifdef __NEW_THREADS - int oldtype = LIBC_CANCEL_ASYNC (); - int result = __syscall_ioctl(fd, request, arg); + oldtype = LIBC_CANCEL_ASYNC (); + result = __syscall_ioctl(fd, request, arg); LIBC_CANCEL_RESET (oldtype); return result; #endif -- cgit v1.2.3