From 63a4c9adf227a6f6a5f7f70f6dc3f8863f846927 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 12 Sep 2018 00:28:34 -0400
Subject: remove spurious inclusion of libc.h for LFS64 ABI aliases

the LFS64 macro was not self-documenting and barely saved any
characters. simply use weak_alias directly so that it's clear what's
being done, and doesn't depend on a header to provide a strange macro.
---
 src/fcntl/creat.c           | 3 +--
 src/fcntl/open.c            | 3 +--
 src/fcntl/openat.c          | 3 +--
 src/fcntl/posix_fadvise.c   | 3 +--
 src/fcntl/posix_fallocate.c | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/fcntl')

diff --git a/src/fcntl/creat.c b/src/fcntl/creat.c
index be05faae..8f8aab64 100644
--- a/src/fcntl/creat.c
+++ b/src/fcntl/creat.c
@@ -1,9 +1,8 @@
 #include <fcntl.h>
-#include "libc.h"
 
 int creat(const char *filename, mode_t mode)
 {
 	return open(filename, O_CREAT|O_WRONLY|O_TRUNC, mode);
 }
 
-LFS64(creat);
+weak_alias(creat, creat64);
diff --git a/src/fcntl/open.c b/src/fcntl/open.c
index 3928a6e6..1d817a2d 100644
--- a/src/fcntl/open.c
+++ b/src/fcntl/open.c
@@ -1,7 +1,6 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
 
 int open(const char *filename, int flags, ...)
 {
@@ -21,4 +20,4 @@ int open(const char *filename, int flags, ...)
 	return __syscall_ret(fd);
 }
 
-LFS64(open);
+weak_alias(open, open64);
diff --git a/src/fcntl/openat.c b/src/fcntl/openat.c
index e741336c..ad165ec3 100644
--- a/src/fcntl/openat.c
+++ b/src/fcntl/openat.c
@@ -1,7 +1,6 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
 
 int openat(int fd, const char *filename, int flags, ...)
 {
@@ -17,4 +16,4 @@ int openat(int fd, const char *filename, int flags, ...)
 	return syscall_cp(SYS_openat, fd, filename, flags|O_LARGEFILE, mode);
 }
 
-LFS64(openat);
+weak_alias(openat, openat64);
diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c
index c1a0ef5a..75b8e1ae 100644
--- a/src/fcntl/posix_fadvise.c
+++ b/src/fcntl/posix_fadvise.c
@@ -1,6 +1,5 @@
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int posix_fadvise(int fd, off_t base, off_t len, int advice)
 {
@@ -16,4 +15,4 @@ int posix_fadvise(int fd, off_t base, off_t len, int advice)
 #endif
 }
 
-LFS64(posix_fadvise);
+weak_alias(posix_fadvise, posix_fadvise64);
diff --git a/src/fcntl/posix_fallocate.c b/src/fcntl/posix_fallocate.c
index 91d8063c..c57a24ae 100644
--- a/src/fcntl/posix_fallocate.c
+++ b/src/fcntl/posix_fallocate.c
@@ -1,6 +1,5 @@
 #include <fcntl.h>
 #include "syscall.h"
-#include "libc.h"
 
 int posix_fallocate(int fd, off_t base, off_t len)
 {
@@ -8,4 +7,4 @@ int posix_fallocate(int fd, off_t base, off_t len)
 		__SYSCALL_LL_E(len));
 }
 
-LFS64(posix_fallocate);
+weak_alias(posix_fallocate, posix_fallocate64);
-- 
cgit v1.2.1