From 71db517ec7fffdcb0bf4c134b182832b4cb231ed Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Tue, 30 Mar 2010 16:54:50 +0300 Subject: [PATCH] preload/interface.master: Fix error: conflicting types for scandir. By Lucas Nussbaum Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto --- preload/interface.master | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/preload/interface.master b/preload/interface.master index a8c145a..efd0280 100644 --- a/preload/interface.master +++ b/preload/interface.master @@ -409,21 +409,10 @@ WRAP: int rmdir(const char *pathname) : \ map(pathname) fail_if_readonly(pathname,-1,EROFS) #ifdef HAVE_SCANDIR -#ifdef HAVE_LINUX_SCANDIR -WRAP: int scandir(const char *dir, struct dirent ***namelist, \ - SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *)) : \ - map(dir) hardcode_param(3,filter) -#endif #ifdef HAVE_OSX_SCANDIR WRAP: int scandir(const char *dirname, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(const void *, const void *)): map(dirname) #endif #endif -#ifdef HAVE_SCANDIR64 -WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \ - int(*filter)(const struct dirent64 *), \ - int(*compar)(const void *, const void *)) : \ - map(dir) -#endif #ifdef HAVE_SETXATTR #ifdef HAVE_LINUX_XATTRS WRAP: int setxattr(const char *path, const char *name, const void *value, \ -- 1.7.0