diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads/wrapsyscall.c | 11 | ||||
| -rw-r--r-- | libpthread/nptl/sem_open.c | 10 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h | 4 |
3 files changed, 5 insertions, 20 deletions
diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads/wrapsyscall.c index 668b3911c..ca046a442 100644 --- a/libpthread/linuxthreads/wrapsyscall.c +++ b/libpthread/linuxthreads/wrapsyscall.c @@ -80,13 +80,12 @@ CANCELABLE_SYSCALL (int, close, (int fd), (fd)) CANCELABLE_SYSCALL_VA (int, fcntl, (int fd, int cmd, ...), (fd, cmd, va_arg (ap, long int)), cmd) -#if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 32 +#if __WORDSIZE == 32 /* fcntl64(2). */ CANCELABLE_SYSCALL_VA (int, fcntl64, (int fd, int cmd, ...), (fd, cmd, va_arg (ap, long int)), cmd) #endif - /* fsync(2). */ CANCELABLE_SYSCALL (int, fsync, (int fd), (fd)) @@ -95,11 +94,9 @@ CANCELABLE_SYSCALL (int, fsync, (int fd), (fd)) CANCELABLE_SYSCALL (off_t, lseek, (int fd, off_t offset, int whence), (fd, offset, whence)) -#ifdef __UCLIBC_HAS_LFS__ /* lseek64(2). */ CANCELABLE_SYSCALL (off64_t, lseek64, (int fd, off64_t offset, int whence), (fd, offset, whence)) -#endif #if defined(__NR_msync) && defined(__ARCH_USE_MMU__) @@ -122,11 +119,9 @@ CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...), (pathname, flags, va_arg (ap, mode_t)), flags) -#ifdef __UCLIBC_HAS_LFS__ /* open64(3). */ CANCELABLE_SYSCALL_VA (int, open64, (const char *pathname, int flags, ...), (pathname, flags, va_arg (ap, mode_t)), flags) -#endif /* pause(2). */ CANCELABLE_SYSCALL (int, pause, (void), ()) @@ -139,7 +134,7 @@ CANCELABLE_SYSCALL (ssize_t, pread, (int fd, void *buf, size_t count, (fd, buf, count, offset)) -#if defined __UCLIBC_HAS_LFS__ && defined __NR_pread64 +#if defined __NR_pread64 /* pread64(3). */ CANCELABLE_SYSCALL (ssize_t, pread64, (int fd, void *buf, size_t count, off64_t offset), @@ -152,7 +147,7 @@ CANCELABLE_SYSCALL (ssize_t, pwrite, (int fd, const void *buf, size_t n, (fd, buf, n, offset)) -#if defined __UCLIBC_HAS_LFS__ && defined __NR_pwrited64 +#if defined __NR_pwrited64 /* pwrite64(3). */ CANCELABLE_SYSCALL (ssize_t, pwrite64, (int fd, const void *buf, size_t n, off64_t offset), diff --git a/libpthread/nptl/sem_open.c b/libpthread/nptl/sem_open.c index 5584557ff..d811ec503 100644 --- a/libpthread/nptl/sem_open.c +++ b/libpthread/nptl/sem_open.c @@ -42,14 +42,8 @@ #define __setmntent setmntent #define __statfs statfs #define __libc_close close -#ifdef __UCLIBC_HAS_LFS__ -# define __libc_open open64 -# define __fxstat64(vers, fd, buf) fstat64(fd, buf) -#else -# define __libc_open open -# define __fxstat64(vers, fd, buf) fstat(fd, buf) -# define stat64 stat -#endif +#define __libc_open open64 +#define __fxstat64(vers, fd, buf) fstat64(fd, buf) #define __libc_write write diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h index c92bd7246..2f4b16bce 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -114,13 +114,9 @@ /* The LFS support in asynchronous I/O is also available. */ #define _LFS64_ASYNCHRONOUS_IO 1 - -#ifdef __UCLIBC_HAS_LFS__ -/* The rest of the LFS is also available. */ #define _LFS_LARGEFILE 1 #define _LFS64_LARGEFILE 1 #define _LFS64_STDIO 1 -#endif /* POSIX shared memory objects are implemented. */ #define _POSIX_SHARED_MEMORY_OBJECTS 200809L |