diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:48:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:48:14 -0700 |
| commit | 03af952060fee063679864d82cdd76f94d56d263 (patch) | |
| tree | c5d020757b7fdb3e5d266bbc802e0f7f3798153c /io/lockf.c | |
| parent | c5757acd6e9aafcf042b6cd6d7f9e70d957e1e3a (diff) | |
| download | glibc-03af952060fee063679864d82cdd76f94d56d263.tar glibc-03af952060fee063679864d82cdd76f94d56d263.tar.gz glibc-03af952060fee063679864d82cdd76f94d56d263.tar.bz2 glibc-03af952060fee063679864d82cdd76f94d56d263.zip | |
Clean up lockf64, fseeko64, ftello64, fgetpos64, fsetpos64 for off64_t == off_t.
Diffstat (limited to 'io/lockf.c')
| -rw-r--r-- | io/lockf.c | 16 |
1 files changed, 14 insertions, 2 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 |