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/misc/getrlimit.c | 3 +--
 src/misc/lockf.c     | 3 +--
 src/misc/nftw.c      | 3 +--
 src/misc/setrlimit.c | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/misc')

diff --git a/src/misc/getrlimit.c b/src/misc/getrlimit.c
index b073677f..2ab2f0f4 100644
--- a/src/misc/getrlimit.c
+++ b/src/misc/getrlimit.c
@@ -1,7 +1,6 @@
 #include <sys/resource.h>
 #include <errno.h>
 #include "syscall.h"
-#include "libc.h"
 
 #define FIX(x) do{ if ((x)>=SYSCALL_RLIM_INFINITY) (x)=RLIM_INFINITY; }while(0)
 
@@ -24,4 +23,4 @@ int getrlimit(int resource, struct rlimit *rlim)
 	return 0;
 }
 
-LFS64(getrlimit);
+weak_alias(getrlimit, getrlimit64);
diff --git a/src/misc/lockf.c b/src/misc/lockf.c
index d8f82efd..16a80bec 100644
--- a/src/misc/lockf.c
+++ b/src/misc/lockf.c
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libc.h"
 
 int lockf(int fd, int op, off_t size)
 {
@@ -30,4 +29,4 @@ int lockf(int fd, int op, off_t size)
 	return -1;
 }
 
-LFS64(lockf);
+weak_alias(lockf, lockf64);
diff --git a/src/misc/nftw.c b/src/misc/nftw.c
index eb9014bc..0a464100 100644
--- a/src/misc/nftw.c
+++ b/src/misc/nftw.c
@@ -6,7 +6,6 @@
 #include <string.h>
 #include <limits.h>
 #include <pthread.h>
-#include "libc.h"
 
 struct history
 {
@@ -126,4 +125,4 @@ int nftw(const char *path, int (*fn)(const char *, const struct stat *, int, str
 	return r;
 }
 
-LFS64(nftw);
+weak_alias(nftw, nftw64);
diff --git a/src/misc/setrlimit.c b/src/misc/setrlimit.c
index 8a50f410..7a66ab29 100644
--- a/src/misc/setrlimit.c
+++ b/src/misc/setrlimit.c
@@ -47,4 +47,4 @@ int setrlimit(int resource, const struct rlimit *rlim)
 	return 0;
 }
 
-LFS64(setrlimit);
+weak_alias(setrlimit, setrlimit64);
-- 
cgit v1.2.1