package/develop/installwatch/12-fix-scandir.patch

   1 diff -Naur installwatch-0.7.0beta7PREV1/installwatch.c installwatch-0.7.0beta7/installwatch.c
   2 --- installwatch-0.7.0beta7PREV1/installwatch.c 2014-12-20 08:20:24.000000000 +0800
   3 +++ installwatch-0.7.0beta7/installwatch.c      2014-12-20 08:31:17.000000000 +0800
   4 @@ -95,18 +95,11 @@
   5  static int (*true_xstat)(int,const char *,struct stat *);
   6  static int (*true_lxstat)(int,const char *,struct stat *);
   7
   8 -#if(GLIBC_MINOR >= 10)
   9
  10  static int (*true_scandir)(    const char *,struct dirent ***,
  11                                 int (*)(const struct dirent *),
  12                                 int (*)(const struct dirent **,const struct dirent **));
  13
  14 -#else
  15 -
  16 -static int (*true_scandir)(    const char *,struct dirent ***,
  17 -                               int (*)(const struct dirent *),
  18 -                               int (*)(const void *,const void *));
  19 -#endif
  20
  21  static int (*true_symlink)(const char *, const char *);
  22  static int (*true_truncate)(const char *, TRUNCATE_T);
  23 @@ -124,15 +117,9 @@
  24  static int (*true_open64)(const char *, int, ...);
  25  static struct dirent64 *(*true_readdir64)(DIR *dir);
  26
  27 -#if(GLIBC_MINOR >= 10)
  28  static int (*true_scandir64)(  const char *,struct dirent64 ***,
  29                                 int (*)(const struct dirent64 *),
  30                                 int (*)(const struct dirent64 **,const struct dirent64 **));
  31 -#else
  32 -static int (*true_scandir64)(  const char *,struct dirent64 ***,
  33 -                               int (*)(const struct dirent64 *),
  34 -                               int (*)(const void *,const void *));
  35 -#endif
  36  static int (*true_xstat64)(int,const char *, struct stat64 *);
  37  static int (*true_lxstat64)(int,const char *, struct stat64 *);
  38  static int (*true_truncate64)(const char *, __off64_t);
  39 @@ -3071,11 +3058,7 @@
  40
  41  int scandir(   const char *dir,struct dirent ***namelist,
  42                 int (*select)(const struct dirent *),
  43 -#if (GLIBC_MINOR >= 10)
  44                 int (*compar)(const struct dirent **,const struct dirent **)    ) {
  45 -#else
  46 -               int (*compar)(const void *,const void *)        ) {
  47 -#endif
  48         int result;
  49
  50         if (!libc_handle)
  51 @@ -3686,11 +3669,7 @@
  52
  53  int scandir64( const char *dir,struct dirent64 ***namelist,
  54                 int (*select)(const struct dirent64 *),
  55 -#if (GLIBC_MINOR >= 10)
  56                 int (*compar)(const struct dirent64 **,const struct dirent64 **)        ) {
  57 -#else
  58 -               int (*compar)(const void *,const void *)        ) {
  59 -#endif
  60         int result;
  61
  62         if (!libc_handle)