diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-08-31 14:07:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-31 14:48:25 +0200 |
| commit | 5f0704b66cea73cf2ab148ec4cff645cc301fd8c (patch) | |
| tree | 13817263f75cf2e72b3bc0ce9abafa4b9b7398e8 /libio/iofdopen.c | |
| parent | 5129873a8e913e207e5f7b4b521c72f41a1bbf6d (diff) | |
| download | glibc-5f0704b66cea73cf2ab148ec4cff645cc301fd8c.zip glibc-5f0704b66cea73cf2ab148ec4cff645cc301fd8c.tar.gz glibc-5f0704b66cea73cf2ab148ec4cff645cc301fd8c.tar.bz2 | |
libio: Assume _LIBC, weak_alias, errno, (__set_)errno &c are defined
Do not define _POSIX_SOURCE.
Diffstat (limited to 'libio/iofdopen.c')
| -rw-r--r-- | libio/iofdopen.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libio/iofdopen.c b/libio/iofdopen.c index 2a1df46..90346a4 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -28,17 +28,7 @@ #include "libioP.h" #include <fcntl.h> -#ifdef _LIBC -# include <shlib-compat.h> -#endif - -#ifndef _IO_fcntl -#ifdef _LIBC -#define _IO_fcntl __fcntl -#else -#define _IO_fcntl fcntl -#endif -#endif +#include <shlib-compat.h> _IO_FILE * _IO_new_fdopen (int fd, const char *mode) @@ -95,11 +85,7 @@ _IO_new_fdopen (int fd, const char *mode) } break; } -#ifdef F_GETFL - int fd_flags = _IO_fcntl (fd, F_GETFL); -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR) -#endif + int fd_flags = __fcntl (fd, F_GETFL); if (fd_flags == -1) return NULL; @@ -129,12 +115,9 @@ _IO_new_fdopen (int fd, const char *mode) if ((read_write & _IO_IS_APPENDING) && !(fd_flags & O_APPEND)) { do_seek = true; -#ifdef F_SETFL - if (_IO_fcntl (fd, F_SETFL, fd_flags | O_APPEND) == -1) -#endif + if (__fcntl (fd, F_SETFL, fd_flags | O_APPEND) == -1) return NULL; } -#endif new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE)); if (new_f == NULL) |