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/dirent/alphasort.c   | 3 +--
 src/dirent/readdir.c     | 3 +--
 src/dirent/readdir_r.c   | 2 +-
 src/dirent/scandir.c     | 3 +--
 src/dirent/versionsort.c | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/dirent')

diff --git a/src/dirent/alphasort.c b/src/dirent/alphasort.c
index 42050fb7..bee672eb 100644
--- a/src/dirent/alphasort.c
+++ b/src/dirent/alphasort.c
@@ -1,10 +1,9 @@
 #include <string.h>
 #include <dirent.h>
-#include "libc.h"
 
 int alphasort(const struct dirent **a, const struct dirent **b)
 {
 	return strcoll((*a)->d_name, (*b)->d_name);
 }
 
-LFS64(alphasort);
+weak_alias(alphasort, alphasort64);
diff --git a/src/dirent/readdir.c b/src/dirent/readdir.c
index eef92f79..569fc705 100644
--- a/src/dirent/readdir.c
+++ b/src/dirent/readdir.c
@@ -3,7 +3,6 @@
 #include <stddef.h>
 #include "__dirent.h"
 #include "syscall.h"
-#include "libc.h"
 
 typedef char dirstream_buf_alignment_check[1-2*(int)(
 	offsetof(struct __dirstream, buf) % sizeof(off_t))];
@@ -27,4 +26,4 @@ struct dirent *readdir(DIR *dir)
 	return de;
 }
 
-LFS64(readdir);
+weak_alias(readdir, readdir64);
diff --git a/src/dirent/readdir_r.c b/src/dirent/readdir_r.c
index daa6c6ed..6293a514 100644
--- a/src/dirent/readdir_r.c
+++ b/src/dirent/readdir_r.c
@@ -26,4 +26,4 @@ int readdir_r(DIR *restrict dir, struct dirent *restrict buf, struct dirent **re
 	return 0;
 }
 
-LFS64_2(readdir_r, readdir64_r);
+weak_alias(readdir_r, readdir64_r);
diff --git a/src/dirent/scandir.c b/src/dirent/scandir.c
index 3af2b50f..7ee195dd 100644
--- a/src/dirent/scandir.c
+++ b/src/dirent/scandir.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <errno.h>
 #include <stddef.h>
-#include "libc.h"
 
 int scandir(const char *path, struct dirent ***res,
 	int (*sel)(const struct dirent *),
@@ -45,4 +44,4 @@ int scandir(const char *path, struct dirent ***res,
 	return cnt;
 }
 
-LFS64(scandir);
+weak_alias(scandir, scandir64);
diff --git a/src/dirent/versionsort.c b/src/dirent/versionsort.c
index 410cb703..d4c48923 100644
--- a/src/dirent/versionsort.c
+++ b/src/dirent/versionsort.c
@@ -1,7 +1,6 @@
 #define _GNU_SOURCE
 #include <string.h>
 #include <dirent.h>
-#include "libc.h"
 
 int versionsort(const struct dirent **a, const struct dirent **b)
 {
@@ -9,4 +8,4 @@ int versionsort(const struct dirent **a, const struct dirent **b)
 }
 
 #undef versionsort64
-LFS64(versionsort);
+weak_alias(versionsort, versionsort64);
-- 
cgit v1.2.1