[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber/libiris
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2009-03-07 21:33:43
Message-ID: 1236461623.412234.26461.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 936548 by chehrlic:

more win32 compile++ fun... :(

 M  +10 -3     CMakeLists.txt  
 M  +1 -1      iris/irisnet/noncore/icelocaltransport.cpp  
 M  +2 -0      iris/libidn/stringprep.h  
 M  +1 -0      iris/xmpp/cutestuff/socks.cpp  
 M  +1 -0      iris/xmpp/xmpp-im/s5b.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/CMakeLists.txt \
#936547:936548 @@ -5,7 +5,9 @@
 FIND_PACKAGE(ZLIB REQUIRED)
 
 remove_definitions(-DQT_NO_HTTP)
-add_definitions(-fPIC)
+if(NOT MSVC)
+  add_definitions(-fPIC)
+endif(NOT MSVC)
 
 include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}/iris
@@ -110,12 +112,10 @@
 iris/irisnet/noncore/stunbinding.cpp
 iris/irisnet/noncore/stuntransaction.cpp
 iris/irisnet/noncore/processquit.cpp
-iris/irisnet/corelib/netinterface_win.cpp
 iris/irisnet/corelib/netavailability.cpp
 iris/irisnet/corelib/netnames_jdns.cpp
 iris/irisnet/corelib/netnames.cpp
 iris/irisnet/corelib/irisnetplugin.cpp
-iris/irisnet/corelib/netinterface_unix.cpp
 iris/irisnet/corelib/netinterface.cpp
 iris/irisnet/corelib/jdnsshared.cpp
 iris/irisnet/corelib/objectsession.cpp
@@ -143,6 +143,12 @@
 
 )
 
+if(WIN32)
+  LIST(APPEND iris_SRCS iris/irisnet/corelib/netinterface_win.cpp)
+else(WIN32)
+  LIST(APPEND iris_SRCS iris/irisnet/corelib/netinterface_unix.cpp)
+endif(WIN32)
+
 set(libiris_SRCS 
     ${cutestuff_SRCS} 
     ${iris_SRCS} 
@@ -252,6 +258,7 @@
 #xmpptest/xmpptest.cpp
 #)
 
+add_definitions(-DIRISNET_STATIC)
 
 kde4_add_library(iris_kopete STATIC ${libiris_SRCS})
 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/irisnet/noncore/icelocaltransport.cpp \
#936547:936548 @@ -315,7 +315,7 @@
 	{
 		// this might be a ChannelData message.  check the first
 		//   two bits:
-		if(stunAllocate && alloc_started && buf.size() >= 1 && buf[0] & 0xC0 == 0x40)
+		if(stunAllocate && alloc_started && buf.size() >= 1 && (buf[0] & 0xC0) == 0x40)
 		{
 			QHostAddress fromAddr;
 			int fromPort;
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/libidn/stringprep.h \
#936547:936548 @@ -31,7 +31,9 @@
 
 #include <qglobal.h>
 #if defined(Q_OS_WIN32) && !defined(Q_CC_GNU)
+#ifndef _SSIZE_T_DEFINED
 typedef int ssize_t;
+#endif
 #else
 #include <unistd.h>		/* ssize_t */
 #endif
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/cutestuff/socks.cpp \
#936547:936548 @@ -34,6 +34,7 @@
 
 #ifdef Q_OS_WIN32
 #include <windows.h>
+#include <winsock2.h>
 #endif
 
 #ifdef Q_OS_UNIX
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/xmpp-im/s5b.cpp \
#936547:936548 @@ -32,6 +32,7 @@
 
 #ifdef Q_OS_WIN
 # include <windows.h>
+# include <winsock2.h>
 #else
 # include <netinet/in.h>
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]