Probably related to gcc 4.4?
Signed-off-by: Felipe Contreras <[email protected]>
---
include/config_hardcoded.h | 2 +-
preload/generate.py | 4 ++--
preload/interface.master | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/config_hardcoded.h b/include/config_hardcoded.h
index 8f6d1e0..a64515a 100644
--- a/include/config_hardcoded.h
+++ b/include/config_hardcoded.h
@@ -18,5 +18,5 @@
#define SCANDIR_TYPE_ARG3 int(*filter)(const struct dirent *)
/* Define to the type of arg 4 for `scandir'. */
-#define SCANDIR_TYPE_ARG4 int(*compar)(const void *,const void *)
+#define SCANDIR_TYPE_ARG4 int(*compar)(const struct dirent **,const struct
dirent **)
diff --git a/preload/generate.py b/preload/generate.py
index 25e231b..f22126c 100644
--- a/preload/generate.py
+++ b/preload/generate.py
@@ -164,8 +164,8 @@ W('int removexattr(const char *path, const char *name)',
b_map("path"))
W('int rename(const char *oldpath, const char *newpath)', b_map("oldpath"),
b_map("newpath"))
W('int revoke(const char *file)', b_map("file"))
W('int rmdir(const char *pathname)', b_map("pathname"))
-W('int scandir(const char *dir, struct dirent ***namelist, SCANDIR_TYPE_ARG3,
int(*compar)(const void *, const void *))', b_map("dir"),
argnames=['dir','namelist','filter','compar'])
-W('int scandir64(const char *dir, struct dirent64 ***namelist,
int(*filter)(const struct dirent64 *), int(*compar)(const void *, const void
*))', b_map("dir"),argnames=['dir','namelist','filter','compar'])
+W('int scandir(const char *dir, struct dirent ***namelist, SCANDIR_TYPE_ARG3,
int(*compar)(const struct dirent **, const struct dirent **)))', b_map("dir"),
argnames=['dir','namelist','filter','compar'])
+W('int scandir64(const char *dir, struct dirent64 ***namelist,
int(*filter)(const struct dirent64 *), int(*compar)(const struct dirent64 **,
const struct dirent64 **))',
b_map("dir"),argnames=['dir','namelist','filter','compar'])
W('int setxattr(const char *path, const char *name, const void *value, size_t
size, int flags)', b_map("path"))
W('int stat(const char *file_name, struct stat *buf)', b_map("file_name"))
W('int stat64(const char *file_name, struct stat64 *buf)', b_map("file_name"))
diff --git a/preload/interface.master b/preload/interface.master
index 55a9481..f1c4ce9 100644
--- a/preload/interface.master
+++ b/preload/interface.master
@@ -407,7 +407,7 @@ WRAP: int rmdir(const char *pathname) : \
#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 *)) : \
+ SCANDIR_TYPE_ARG3, int(*compar)(const struct dirent **, const struct
dirent **)) : \
map(dir) hardcode_param(3,filter)
#endif
#ifdef HAVE_OSX_SCANDIR
@@ -417,7 +417,7 @@ WRAP: int scandir(const char *dirname, struct dirent
***namelist, int (*select)(
#ifdef HAVE_SCANDIR64
WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \
int(*filter)(const struct dirent64 *), \
- int(*compar)(const void *, const void *)) : \
+ int(*compar)(const struct dirent64 **, const struct dirent64 **)) : \
map(dir)
#endif
#ifdef HAVE_SETXATTR
--
1.6.3.2
_______________________________________________
Scratchbox-devel mailing list
[email protected]
http://lists.scratchbox.org/cgi-bin/mailman/listinfo/scratchbox-devel
