diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/lockf.c | 16 | ||||
| -rw-r--r-- | io/lockf64.c | 7 |
2 files changed, 20 insertions, 3 deletions
diff --git a/io/lockf.c b/io/lockf.c index 42232d0764..1ee95114d7 100644 --- a/io/lockf.c +++ b/io/lockf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +/* Copyright (C) 1994-2012 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 @@ -15,9 +15,17 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +/* We need to avoid the header declaration of lockf64, because + the types don't match lockf and then the compiler will + complain about the mismatch when we do the alias below. */ +#define lockf64 __renamed_lockf64 + +#include <fcntl.h> + +#undef lockf64 + #include <sys/types.h> #include <unistd.h> -#include <fcntl.h> #include <errno.h> #include <string.h> @@ -71,3 +79,7 @@ lockf (int fd, int cmd, off_t len) the fcntl() function will take care of it. */ return __fcntl (fd, cmd, &fl); } + +#ifdef __OFF_T_MATCHES_OFF64_T +weak_alias (lockf, lockf64) +#endif diff --git a/io/lockf64.c b/io/lockf64.c index 80ca151c19..60516ebaad 100644 --- a/io/lockf64.c +++ b/io/lockf64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc. +/* Copyright (C) 1994-2012 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 @@ -21,6 +21,9 @@ #include <errno.h> #include <string.h> +/* lockf.c defines lockf64 as an lias if __OFF_T_MATCHES_OFF64_T. */ +#ifndef __OFF_T_MATCHES_OFF64_T + /* lockf is a simplified interface to fcntl's locking facilities. */ int @@ -76,3 +79,5 @@ lockf64 (int fd, int cmd, off64_t len64) return __fcntl (fd, cmd, &fl); } + +#endif |