qt4: avoiding the use of member variable <defname> of struct <__res_state>, as it...
[openwrt/svn-archive/archive.git] / Xorg / lib / qt4 / patches / 100-do_not_use_res.defdname.patch
1 --- qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp 2010-05-04 02:43:25.000000000 +0200
2 +++ qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp.new 2010-06-20 14:43:48.565315801 +0200
3 @@ -326,7 +326,7 @@
4
5 QString QHostInfo::localDomainName()
6 {
7 -#if !defined(Q_OS_VXWORKS)
8 +#if 0
9 resolveLibrary();
10 if (local_res_ninit) {
11 // using thread-safe version
12 --- qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp 2010-05-04 02:43:25.000000000 +0200
13 +++ qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp.new 2010-06-20 14:43:48.565315801 +0200
14 @@ -2499,8 +2499,8 @@
15 break;
16 }
17 # endif
18 - if ( *res.defdname )
19 - theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() );
20 +// if ( *res.defdname )
21 +// theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() );
22 #else
23 res_init();
24 int i;
25 @@ -2515,8 +2515,8 @@
26 break;
27 }
28 # endif
29 - if ( *_res.defdname )
30 - theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() );
31 +// if ( *_res.defdname )
32 +// theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() );
33 #endif
34
35 // the code above adds "0.0.0.0" as a name server at the slightest