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/scandir.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/scandir.c')
| -rw-r--r-- | dirent/scandir.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/dirent/scandir.c b/dirent/scandir.c index 8b0a87ba06..6dce54d64a 100644 --- a/dirent/scandir.c +++ b/dirent/scandir.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1992-1998,2000,2002,2003,2009,2011 - 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 @@ -16,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 scandir64, because + the types don't match scandir and then the compiler will + complain about the mismatch when we do the alias below. */ +#define scandir64 __renamed_scandir64 + #include <dirent.h> + +#undef scandir64 + #include <fcntl.h> #ifndef SCANDIR @@ -35,3 +42,7 @@ SCANDIR (dir, namelist, select, cmp) { return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp); } + +#ifdef _DIRENT_MATCHES_DIRENT64 +weak_alias (scandir, scandir64) +#endif |