diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-04-21 23:03:32 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:41 +0200 |
| commit | f74f77b155bd34f75193179d7e4ce63ace771af3 (patch) | |
| tree | 0bd63d21e722c1786fc583552464c4bc4d426e33 /include/fcntl.h | |
| parent | 4228d2f34cc0b3b70adc16cec499aeef034aece0 (diff) | |
fcntl: add cancellation to fcntl64, use cancel.h
fcntl64 missed cancellation.
Guard fcntl64 for 32bit archs.
Reuse as much code as possible in __syscall_fcntl.c.
Provide alias fcntl64 if that syscall is not available.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'include/fcntl.h')
| -rw-r--r-- | include/fcntl.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/fcntl.h b/include/fcntl.h index 64c8e20d3..54ccc7ba5 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -75,7 +75,10 @@ __BEGIN_DECLS __THROW. */ #if !defined(__USE_FILE_OFFSET64) || defined(__LP64__) extern int fcntl (int __fd, int __cmd, ...); +# ifdef _LIBC +extern int __fcntl_nocancel(int, int, long) attribute_hidden; libc_hidden_proto(fcntl) +# endif #else # ifdef __REDIRECT extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64); @@ -85,7 +88,10 @@ extern int __REDIRECT (fcntl, (int __fd, int __cmd, ...), fcntl64); #endif #if defined(__USE_LARGEFILE64) && !defined(__LP64__) extern int fcntl64 (int __fd, int __cmd, ...); +# ifdef _LIBC +extern int __fcntl64_nocancel(int, int, long) attribute_hidden; libc_hidden_proto(fcntl64) +# endif #endif /* Open FILE and return a new file descriptor for it, or -1 on error. @@ -236,11 +242,6 @@ extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len); # endif #endif -#ifdef _LIBC -extern int __fcntl_nocancel (int fd, int cmd, ...); -libc_hidden_proto(__fcntl_nocancel) -#endif - __END_DECLS #endif /* fcntl.h */ |