[Kde-cygwin-cvs] CVS: qt-3/src/network qdns.cpp,1.1.1.16,1.1.1.17 qt_network.pri,1.1.1.10,1.1.1.11

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/src/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/src/network

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qdns.cpp qt_network.pri 
Log Message:
reapply patches which were lost during my not so good update to 3.3.5

Index: qdns.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qdns.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qdns.cpp	22 Sep 2005 12:54:52 -0000	1.1.1.16
+++ qdns.cpp	30 Sep 2005 16:58:31 -0000	1.1.1.17
@@ -79,6 +79,12 @@
 #include "../3rdparty/dlcompat/dlfcn.h"
 #endif
 
+#if defined(Q_OS_CYGWIN)
+#undef Q_OS_UNIX
+#define QT_WA( uni, ansi ) ansi
+#endif 
+
+
 //#define QDNS_DEBUG
 
 static Q_UINT16 id; // ### seeded started by now()
@@ -2276,6 +2282,10 @@
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_CYGWIN)
 
+#if defined(Q_OS_CYGWIN)
+#include <qt_windows.h>
+#endif 
+
 #if defined(Q_DNS_SYNCHRONOUS)
 void QDns::doSynchronousLookup()
 {

Index: qt_network.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/network/qt_network.pri,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qt_network.pri	22 Sep 2005 12:54:53 -0000	1.1.1.10
+++ qt_network.pri	30 Sep 2005 16:58:31 -0000	1.1.1.11
@@ -1,4 +1,5 @@
 # Qt network module
+cygwin-g++:DEFINES+= QT_NO_IPV6
 
 network {
 	HEADERS += $$NETWORK_H/qdns.h \
@@ -18,6 +19,6 @@
 		    $$NETWORK_CPP/qsocket.cpp \
 		    $$NETWORK_CPP/qsocketdevice.cpp
 	unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_unix.cpp
-	win32:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
+	win32:!unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
 	SOURCES    += $$NETWORK_SOURCES
 }