From b6cfea1299f5d86b17508fd7a52e3fb5bc40bb63 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 14 Sep 2003 20:38:01 +0000 Subject: Update. 2003-09-14 Ulrich Drepper * dirent/dirent.h: Remove __THROW from scandir. 2003-09-14 Philip Blundell * sysdeps/unix/sysv/linux/arm/mmap.S: Use sys_mmap2 if it's known to be available. * sysdeps/unix/sysv/linux/arm/mmap64.S: Optimise code a little. * sysdeps/arm/memset.S: Rewrite. --- dirent/dirent.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'dirent/dirent.h') diff --git a/dirent/dirent.h b/dirent/dirent.h index 9f7c380..319fb74 100644 --- a/dirent/dirent.h +++ b/dirent/dirent.h @@ -239,14 +239,14 @@ extern int dirfd (DIR *__dirp) __THROW; extern int scandir (__const char *__restrict __dir, struct dirent ***__restrict __namelist, int (*__selector) (__const struct dirent *), - int (*__cmp) (__const void *, __const void *)) __THROW; + int (*__cmp) (__const void *, __const void *)); # else # ifdef __REDIRECT extern int __REDIRECT (scandir, (__const char *__restrict __dir, struct dirent ***__restrict __namelist, int (*__selector) (__const struct dirent *), - int (*__cmp) (__const void *, __const void *)) __THROW, + int (*__cmp) (__const void *, __const void *)), scandir64); # else # define scandir scandir64 @@ -259,7 +259,7 @@ extern int __REDIRECT (scandir, extern int scandir64 (__const char *__restrict __dir, struct dirent64 ***__restrict __namelist, int (*__selector) (__const struct dirent64 *), - int (*__cmp) (__const void *, __const void *)) __THROW; + int (*__cmp) (__const void *, __const void *)); # endif /* Function to compare two `struct dirent's alphabetically. */ @@ -269,8 +269,7 @@ extern int alphasort (__const void *__e1, __const void *__e2) # else # ifdef __REDIRECT extern int __REDIRECT (alphasort, - (__const void *__e1, __const void *__e2) - __THROW, + (__const void *__e1, __const void *__e2) __THROW, alphasort64) __attribute_pure__; # else # define alphasort alphasort64 @@ -290,8 +289,7 @@ extern int versionsort (__const void *__e1, __const void *__e2) # else # ifdef __REDIRECT extern int __REDIRECT (versionsort, - (__const void *__e1, __const void *__e2) - __THROW, + (__const void *__e1, __const void *__e2) __THROW, versionsort64) __attribute_pure__; # else # define versionsort versionsort64 -- cgit v1.1