diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
| commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
| tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /dirent/alphasort.c | |
| parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
| parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) | |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'dirent/alphasort.c')
| -rw-r--r-- | dirent/alphasort.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/dirent/alphasort.c b/dirent/alphasort.c index 8255e8d573..6b2a70770d 100644 --- a/dirent/alphasort.c +++ b/dirent/alphasort.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2016 Free Software Foundation, Inc. +/* Copyright (C) 1992-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -15,23 +15,14 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* We need to avoid the header declaration of alphasort64, because - the types don't match alphasort and then the compiler will - complain about the mismatch when we do the alias below. */ -#define alphasort64 __renamed_alphasort64 - #include <dirent.h> -#undef alphasort64 - -#include <string.h> +#if !_DIRENT_MATCHES_DIRENT64 +# include <string.h> int alphasort (const struct dirent **a, const struct dirent **b) { return strcoll ((*a)->d_name, (*b)->d_name); } - -#ifdef _DIRENT_MATCHES_DIRENT64 -weak_alias (alphasort, alphasort64) #endif |