aboutsummaryrefslogtreecommitdiff
path: root/x11/kdelibs3/files/patch-kdecore-kextsock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdelibs3/files/patch-kdecore-kextsock.cpp')
-rw-r--r--x11/kdelibs3/files/patch-kdecore-kextsock.cpp39
1 files changed, 23 insertions, 16 deletions
diff --git a/x11/kdelibs3/files/patch-kdecore-kextsock.cpp b/x11/kdelibs3/files/patch-kdecore-kextsock.cpp
index de6b77153c90..d07c32c8cf25 100644
--- a/x11/kdelibs3/files/patch-kdecore-kextsock.cpp
+++ b/x11/kdelibs3/files/patch-kdecore-kextsock.cpp
@@ -1,20 +1,27 @@
-Index: kdecore/kextsock.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/kdecore/kextsock.cpp,v
-retrieving revision 1.67
-diff -u -3 -p -r1.67 kextsock.cpp
--- kdecore/kextsock.cpp 11 Dec 2003 22:54:36 -0000 1.67
-+++ kdecore/kextsock.cpp 24 Jan 2004 17:48:28 -0000
-@@ -85,6 +85,12 @@ extern "C" int res_init();
- #endif
- #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
++++ kdecore/kextsock.cpp 22 Jan 2004 19:59:13 -0000
+@@ -1892,7 +1892,11 @@ int KExtendedSocket::doLookup(const QStr
+ err = kde_getaddrinfo(_host, _serv, &hint, res);
-+#ifdef Q_OS_FREEBSD
-+#ifndef EAI_NODATA
-+#define EAI_NODATA EAI_NONAME
+ #ifdef HAVE_RES_INIT
+- if (err == EAI_NONAME || err == EAI_NODATA || err == EAI_AGAIN)
++ if (err == EAI_NONAME ||
++#ifdef EAI_NODATA
++ err == EAI_NODATA ||
+#endif
++ err == EAI_AGAIN)
+ {
+ // A loookup error occurred and nothing was resolved
+ // However, since the user could have just dialed up to the ISP
+@@ -2274,7 +2278,11 @@ void KExtendedSocket::dnsResultsReady()
+ else
+ {
+ d->status = nothing;
++#ifdef EAI_NODATA
+ setError(IO_LookupError, EAI_NODATA);
++#else
++ setError(IO_LookupError, EAI_NONAME);
+#endif
-+
- //
- // Internal class definitions
- //
+ }
+
+ emit lookupFinished(n);