[patch] updated musl/glibc detect patch

vdr-2.4.1_musl-fix.patch (text/plain), 1.44 KB, created by Joerg Bornkessel (RETIRED) on 2020-03-27 21:08:48 UTC

Signed-off-by: Joerg Bornkessel <[e-mail]> ( 27 Mar 2020 )
diff -Naur vdr-2.4.1.orig/tools.c vdr-2.4.1/tools.c
--- vdr-2.4.1.orig/tools.c	2020-03-27 21:48:48.000000000 +0100
+++ vdr-2.4.1/tools.c	2020-03-27 21:50:35.000000000 +0100
@@ -1540,11 +1540,13 @@
 struct dirent *cReadDir::Next(void)
 {
   if (directory) {
-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+#if defined(__GLIBC__)
+#if defined(__GLIBC_PREREQ) &&!__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
      while (readdir_r(directory, &u.d, &result) == 0 && result) {
 #else
      while ((result = readdir(directory)) != NULL) {
 #endif
+#endif
            if (strcmp(result->d_name, ".") && strcmp(result->d_name, ".."))
               return result;
            }
diff -Naur vdr-2.4.1.orig/tools.h vdr-2.4.1/tools.h
--- vdr-2.4.1.orig/tools.h	2020-03-27 21:48:48.000000000 +0100
+++ vdr-2.4.1/tools.h	2020-03-27 21:51:38.000000000 +0100
@@ -406,12 +406,14 @@
 private:
   DIR *directory;
   struct dirent *result;
-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
+#if defined(__GLIBC__)
+#if defined(__GLIBC_PREREQ) &&!__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24
   union { // according to "The GNU C Library Reference Manual"
     struct dirent d;
     char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
     } u;
 #endif
+#endif
 public:
   cReadDir(const char *Directory);
   ~cReadDir();