[gentoo-commits] gentoo-x86 commit in net-dialup/wvdial/files: wvdial-1.60-dirent.patch

[gentoo-commits] gentoo-x86 commit in net-dialup/wvdial/files: wvdial-1.60-dirent.patch

[Alin Nastac (mrness)]

mrness      09/06/20 09:40:57

  Added:                wvdial-1.60-dirent.patch
  Log:
  Fix compilation error related to glibc-2.10 (#271477).
  Migrate to EAPI 2.
  (Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.1                  net-dialup/wvdial/files/wvdial-1.60-dirent.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?rev=1.1&content-type=text/plain

Index: wvdial-1.60-dirent.patch
===================================================================
diff -Nru wvdial-1.60.orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc
--- wvdial-1.60.orig/wvmodemscan.cc	2007-07-19 23:22:26.000000000 +0200
+++ wvdial-1.60/wvmodemscan.cc	2009-06-20 11:36:15.000000000 +0200
@@ -496,10 +496,8 @@
 }
 
 
-static int filesort(const void *_e1, const void *_e2)
+static int filesort(const dirent **e1, const dirent **e2)
 {
-    dirent const * const *e1 = (dirent const * const *)_e1;
-    dirent const * const *e2 = (dirent const * const *)_e2;
     const char *p1, *p2;
     int diff;
     

[gentoo-commits] gentoo-x86 commit in net-dialup/wvdial/files: wvdial-1.60-dirent.patch

[Alin Nastac (mrness)]

mrness      09/06/20 20:57:34

  Modified:             wvdial-1.60-dirent.patch
  Log:
  Fix dirent patch for glibc versions prior to 2.10.1 (#271477).
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-dialup/wvdial/files/wvdial-1.60-dirent.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?r1=1.1&r2=1.2

Index: wvdial-1.60-dirent.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wvdial-1.60-dirent.patch	20 Jun 2009 09:40:56 -0000	1.1
+++ wvdial-1.60-dirent.patch	20 Jun 2009 20:57:34 -0000	1.2
@@ -1,15 +1,21 @@
-diff -Nru wvdial-1.60.orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc
---- wvdial-1.60.orig/wvmodemscan.cc	2007-07-19 23:22:26.000000000 +0200
-+++ wvdial-1.60/wvmodemscan.cc	2009-06-20 11:36:15.000000000 +0200
-@@ -496,10 +496,8 @@
+diff -Nru a/wvdial-1.60/wvmodemscan.cc b/wvdial-1.60/wvmodemscan.cc
+--- a/wvdial-1.60/wvmodemscan.cc	2007-07-20 00:22:03.000000000 +0300
++++ b/wvdial-1.60/wvmodemscan.cc	2009-06-20 21:43:58.000000000 +0300
+@@ -495,11 +495,16 @@
+ 	// (no internal ISDN support)   || !strncmp(e->d_name, "ttyI", 4);
  }
  
- 
--static int filesort(const void *_e1, const void *_e2)
+-
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)
 +static int filesort(const dirent **e1, const dirent **e2)
++#else
+ static int filesort(const void *_e1, const void *_e2)
++#endif
  {
--    dirent const * const *e1 = (dirent const * const *)_e1;
--    dirent const * const *e2 = (dirent const * const *)_e2;
++#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))
+     dirent const * const *e1 = (dirent const * const *)_e1;
+     dirent const * const *e2 = (dirent const * const *)_e2;
++#endif
      const char *p1, *p2;
      int diff;