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

List:       kopete-devel
Subject:    Re: PATCH (was [Kopete-devel] current cvs won't compile)
From:       Andres Krapf <dae () chez ! com>
Date:       2002-04-27 17:47:44
[Download RAW message or body]

the fix christophe sent was good, but the extern "C" aren't needed

> What is the proper fix then???

i attached a diff, sometimes it's easier than words ;-)

-- 
Andres
["kopeteirc.diff" (text/x-diff)]

Index: dcchandler.cpp
===================================================================
RCS file: /home/kde/kdenonbeta/kopete/protocols/irc/libkirc/dcchandler.cpp,v
retrieving revision 1.6
diff -u -r1.6 dcchandler.cpp
--- dcchandler.cpp	27 Apr 2002 06:28:39 -0000	1.6
+++ dcchandler.cpp	27 Apr 2002 17:42:38 -0000
@@ -90,7 +90,7 @@
 	QCString data(bytes);
 	int actualBytes = readBlock(data.data(), bytes);
 	mFile->writeBlock(data.data(), actualBytes);
-	uint32_t ack = ::htonl(mFile->at());
+	uint32_t ack = htonl(mFile->at());
 	writeBlock((char *)&ack, sizeof(ack));
 	if (mSize != 0)
 	{
@@ -216,7 +216,7 @@
 	uint32_t ack;
 	
 	mSocket->readBlock((char*)&ack, sizeof(ack));
-	ack = ::ntohl(ack);
+	ack = ntohl(ack);
 	
 	int percentage = (ack * 100 / mFile->size());
 	

_______________________________________________
Kopete-devel mailing list
Kopete-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/kopete-devel

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