diff options
author | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:47:58 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2012-08-06 16:48:36 -0700 |
commit | 8e49df1d656c393e913b6c9343f491c59bd527b2 (patch) | |
tree | ac9cb93c6181621769aba412c5bb233498b896e5 /dirent/alphasort.c | |
parent | 03af952060fee063679864d82cdd76f94d56d263 (diff) | |
download | glibc-8e49df1d656c393e913b6c9343f491c59bd527b2.tar.gz glibc-8e49df1d656c393e913b6c9343f491c59bd527b2.tar.xz glibc-8e49df1d656c393e913b6c9343f491c59bd527b2.zip |
Clean up {alphasort,versionsort,scandir,scandirat}{,64} for struct dirent == struct dirent64.
Diffstat (limited to 'dirent/alphasort.c')
-rw-r--r-- | dirent/alphasort.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dirent/alphasort.c b/dirent/alphasort.c index 5939322ab8..6fab7f89bd 100644 --- a/dirent/alphasort.c +++ b/dirent/alphasort.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1997, 1998, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1992-2012 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,7 +15,15 @@ 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> int @@ -23,3 +31,7 @@ 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 |