From 01cad722667c7b25535b2d248598f3d535e7caa9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 21 Apr 1998 22:58:23 +0000 Subject: Update. 1998-04-21 21:49 Zack Weinberg * misc/sys/cdefs.h: New macro __REDIRECT to support changing the asm symbol name of functions. * include/features.h: Kill redundant test. * dirent/dirent.h: Use new macros to implement __USE_FILE_OFFSET64. * io/ftw.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/sys/statvfs.h: Likewise. * libio/stdio.h: Likewise. * resource/sys/resource.h: Likewise. * rt/aio.h: Likewise. * posix/unistd.h: Use new macros for __USE_FILE_OFFSET64 and __FAVOR_BSD. * signal/signal.h: Use new macros for BSD vs. SysV signal(). * misc/Makefile: Drop bsd-compat.c. Make libbsd-compat.a a dummy library. * misc/bsd-compat.c: Removed. --- io/ftw.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'io/ftw.h') diff --git a/io/ftw.h b/io/ftw.h index b7417fc70c..bf0c7c885e 100644 --- a/io/ftw.h +++ b/io/ftw.h @@ -109,8 +109,12 @@ typedef int (*__nftw64_func_t) __P ((__const char *__filename, extern int ftw __P ((__const char *__dir, __ftw_func_t __func, int __descriptors)); #else -extern int ftw __P ((__const char *__dir, __ftw_func_t __func, - int __descriptors)) __asm__ ("ftw64"); +# ifdef __REDIRECT +extern int __REDIRECT (ftw, __P ((__const char *__dir, __ftw_func_t __func, + int __descriptors)), ftw64); +# else +# define nftw nftw64 +# endif #endif #ifdef __USE_LARGEFILE64 extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func, @@ -124,8 +128,12 @@ extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func, extern int nftw __P ((__const char *__dir, __nftw_func_t __func, int __descriptors, int __flag)); # else -extern int nftw __P ((__const char *__dir, __nftw_func_t __func, - int __descriptors, int __flag)) __asm__ ("nftw64"); +# ifdef __REDIRECT +extern int __REDIRECT (nftw, __P ((__const char *__dir, __nftw_func_t __func, + int __descriptors, int __flag)), nftw64); +# else +# define nftw nftw64 +# endif # endif # ifdef __USE_LARGEFILE64 extern int nftw64 __P ((__const char *__dir, __nftw64_func_t __func, -- cgit v1.2.3