git: 24236af8d5eb - stable/12 - libc: hide alphasort_thunk behind I_AM_SCANDIR_B
Ryan Libby
rlibby at FreeBSD.org
Thu Dec 31 20:47:20 UTC 2020
The branch stable/12 has been updated by rlibby:
URL: https://cgit.FreeBSD.org/src/commit/?id=24236af8d5eb595eaf8c171eca53df23e755c432
commit 24236af8d5eb595eaf8c171eca53df23e755c432
Author: Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2020-08-23 11:06:59 +0000
Commit: Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2020-12-31 19:56:33 +0000
libc: hide alphasort_thunk behind I_AM_SCANDIR_B
Should unbreak gcc build as reported by tinderbox:
lib/libc/gen/scandir.c:59:12: warning: 'alphasort_thunk' declared 'static' but never defined [-Wunused-function]
(cherry picked from commit 992bcb37c28ad1a6426df7996f297187ae3d901a)
---
lib/libc/gen/scandir.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 7e5bcce905fb..2b8d244bcc59 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -56,7 +56,9 @@ void qsort_b(void *, size_t, size_t, void *);
#define SELECT(x) select(x)
#endif
+#ifndef I_AM_SCANDIR_B
static int alphasort_thunk(void *thunk, const void *p1, const void *p2);
+#endif
int
#ifdef I_AM_SCANDIR_B
More information about the dev-commits-src-all
mailing list