diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-03-27 04:11:14 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-03-27 04:11:14 -0700 |
| commit | 62f8db6e495ccc77d2f4a0e37406ae97d2ccfd3c (patch) | |
| tree | 1493c5d1f8b85e61fd5afe73c09f6a532df7207e | |
| parent | 8dc1d0baa059066dfce35dc0bfe192252fda431b (diff) | |
| download | glibc-62f8db6e495ccc77d2f4a0e37406ae97d2ccfd3c.tar.gz glibc-62f8db6e495ccc77d2f4a0e37406ae97d2ccfd3c.tar.xz glibc-62f8db6e495ccc77d2f4a0e37406ae97d2ccfd3c.zip | |
Define miss_F_GETOWN_EX only if needed.
When doing i686-unknown-linux-gnu build configured with --enable-kernel=2.6.24, there are several warnings like this: ../sysdeps/unix/sysv/linux/i386/fcntl.c:36:12: warning: ‘miss_F_GETOWN_EX’ defined but not used
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/fcntl.c | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index a1bd98b6e6..d020871231 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-26 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/i386/fcntl.c: Define miss_F_GETOWN_EX + only if needed. + Patch mostly by Paul Pluzhnikov <ppluzhnikov@google.com>. + 2010-03-26 Richard Henderson <rth@redhat.com> * sysdeps/generic/ldsodefs.h (_dl_random): Mark attribute_relro; diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c index 5544d6e0d9..e82a60a885 100644 --- a/sysdeps/unix/sysv/linux/i386/fcntl.c +++ b/sysdeps/unix/sysv/linux/i386/fcntl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2000,2002-2004,2006,2009,2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,23 +25,23 @@ #include <sys/syscall.h> #include <kernel-features.h> -#if __ASSUME_FCNTL64 == 0 +#ifndef __ASSUME_FCNTL64 /* This variable is shared with all files that check for fcntl64. */ int __have_no_fcntl64; #endif #ifdef __ASSUME_F_GETOWN_EX # define miss_F_GETOWN_EX 0 -#else +#elif !defined __ASSUME_FCNTL64 static int miss_F_GETOWN_EX; #endif -#if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0 +#if defined NO_CANCELLATION && !defined __ASSUME_FCNTL64 # define __fcntl_nocancel __libc_fcntl #endif -#if !defined NO_CANCELLATION || __ASSUME_FCNTL64 == 0 +#if !defined NO_CANCELLATION || !defined __ASSUME_FCNTL64 int __fcntl_nocancel (int fd, int cmd, ...) { @@ -52,7 +52,7 @@ __fcntl_nocancel (int fd, int cmd, ...) arg = va_arg (ap, void *); va_end (ap); -#if __ASSUME_FCNTL64 == 0 +#ifndef __ASSUME_FCNTL64 # ifdef __NR_fcntl64 if (! __have_no_fcntl64) { @@ -135,11 +135,11 @@ __fcntl_nocancel (int fd, int cmd, ...) if (!INTERNAL_SYSCALL_ERROR_P (res, err)) return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; -#ifndef __ASSUME_F_GETOWN_EX +# ifndef __ASSUME_F_GETOWN_EX if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) miss_F_GETOWN_EX = 1; else -#endif +# endif { __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); return -1; @@ -168,21 +168,21 @@ __libc_fcntl (int fd, int cmd, ...) arg = va_arg (ap, void *); va_end (ap); -#if __ASSUME_FCNTL64 > 0 +# ifdef __ASSUME_FCNTL64 if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64)) return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg); int oldtype = LIBC_CANCEL_ASYNC (); int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg); -#else +# else if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64)) return __fcntl_nocancel (fd, cmd, arg); int oldtype = LIBC_CANCEL_ASYNC (); int result = __fcntl_nocancel (fd, cmd, arg); -#endif +# endif LIBC_CANCEL_RESET (oldtype); |