| 1 |
mrness 09/06/20 20:57:34 |
| 2 |
|
| 3 |
Modified: wvdial-1.60-dirent.patch |
| 4 |
Log: |
| 5 |
Fix dirent patch for glibc versions prior to 2.10.1 (#271477). |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-dialup/wvdial/files/wvdial-1.60-dirent.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?rev=1.2&view=markup |
| 12 |
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 |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: wvdial-1.60-dirent.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/wvdial/files/wvdial-1.60-dirent.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- wvdial-1.60-dirent.patch 20 Jun 2009 09:40:56 -0000 1.1 |
| 22 |
+++ wvdial-1.60-dirent.patch 20 Jun 2009 20:57:34 -0000 1.2 |
| 23 |
@@ -1,15 +1,21 @@ |
| 24 |
-diff -Nru wvdial-1.60.orig/wvmodemscan.cc wvdial-1.60/wvmodemscan.cc |
| 25 |
---- wvdial-1.60.orig/wvmodemscan.cc 2007-07-19 23:22:26.000000000 +0200 |
| 26 |
-+++ wvdial-1.60/wvmodemscan.cc 2009-06-20 11:36:15.000000000 +0200 |
| 27 |
-@@ -496,10 +496,8 @@ |
| 28 |
+diff -Nru a/wvdial-1.60/wvmodemscan.cc b/wvdial-1.60/wvmodemscan.cc |
| 29 |
+--- a/wvdial-1.60/wvmodemscan.cc 2007-07-20 00:22:03.000000000 +0300 |
| 30 |
++++ b/wvdial-1.60/wvmodemscan.cc 2009-06-20 21:43:58.000000000 +0300 |
| 31 |
+@@ -495,11 +495,16 @@ |
| 32 |
+ // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4); |
| 33 |
} |
| 34 |
|
| 35 |
- |
| 36 |
--static int filesort(const void *_e1, const void *_e2) |
| 37 |
+- |
| 38 |
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10) |
| 39 |
+static int filesort(const dirent **e1, const dirent **e2) |
| 40 |
++#else |
| 41 |
+ static int filesort(const void *_e1, const void *_e2) |
| 42 |
++#endif |
| 43 |
{ |
| 44 |
-- dirent const * const *e1 = (dirent const * const *)_e1; |
| 45 |
-- dirent const * const *e2 = (dirent const * const *)_e2; |
| 46 |
++#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) |
| 47 |
+ dirent const * const *e1 = (dirent const * const *)_e1; |
| 48 |
+ dirent const * const *e2 = (dirent const * const *)_e2; |
| 49 |
++#endif |
| 50 |
const char *p1, *p2; |
| 51 |
int diff; |
Archives