[patch] ${FILESDIR}/centericq-4.21.0-64bit.diff

centericq-4.21.0-64bit.diff (text/plain), 3.75 KB, created by Thomas Weidner on 2006-01-01 08:52:08 UTC

diff -ru centericq-4.21.0/kkconsui-0.1/src/texteditor.cc centericq-4.21.0.new/kkconsui-0.1/src/texteditor.cc
--- centericq-4.21.0/kkconsui-0.1/src/texteditor.cc	2003-09-09 23:51:33.000000000 +0200
+++ centericq-4.21.0.new/kkconsui-0.1/src/texteditor.cc	2006-01-01 17:34:59.228603408 +0100
@@ -1940,7 +1940,7 @@
 }
 
 int texteditor::findint(void *p1, void *p2) {
-    return *(int *) p1 != (int) p2;
+    return *(int *) p1 != (int)(long) p2;
 }
 
 int texteditor::findhighline(void *p1, void *p2) {
diff -ru centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc centericq-4.21.0.new/kkstrtext-0.1/kkstrtext.cc
--- centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc	2006-01-01 17:29:10.702587416 +0100
+++ centericq-4.21.0.new/kkstrtext-0.1/kkstrtext.cc	2006-01-01 17:35:16.313006184 +0100
@@ -431,7 +431,7 @@
 }
 
 int intcompare(void *s1, void *s2) {
-    return (int) s1 != (int) s2;
+    return (int)(long) s1 != (int)(long) s2;
 }
 
 string i2str(int i) {
@@ -885,7 +885,7 @@
 #ifdef HAVE_ICONV
     iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
 
-    if(((int) cd) != -1) {
+    if(((int)(long) cd) != -1) {
 	string r, text(atext);
 	size_t inleft, outleft, soutleft;
 	char *inbuf, *outbuf, *sinbuf, *soutbuf;
diff -ru centericq-4.21.0/src/icqdialogs.cc centericq-4.21.0.new/src/icqdialogs.cc
--- centericq-4.21.0/src/icqdialogs.cc	2006-01-01 17:29:10.550610520 +0100
+++ centericq-4.21.0.new/src/icqdialogs.cc	2006-01-01 17:43:10.585905744 +0100
@@ -894,7 +894,7 @@
     i = m.open();
     m.close();
 
-    if(i) f = (unsigned short) ((int) m.getref(i-1));
+    if(i) f = (unsigned short) ((int)(long) m.getref(i-1));
 }
 
 void icqface::selectlanguage(unsigned short &f) {
@@ -946,7 +946,7 @@
     int i = m.open();
     m.close();
 
-    if(i) f = (imgender) ((int) m.getref(i-1));
+    if(i) f = (imgender) ((int)(long) m.getref(i-1));
 }
 
 void icqface::selectagerange(ICQ2000::AgeRange &r) {
@@ -967,7 +967,7 @@
     int i = m.open();
     m.close();
 
-    if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
+    if(i) r = (ICQ2000::AgeRange) ((int)(long) m.getref(i-1));
 }
 
 bool icqface::edit(string &txt, const string &header) {
@@ -1256,7 +1256,7 @@
 
 	void *p;
 	finished = !db.open(n, b, &p);
-	i = (int) p;
+	i = (int)(long) p;
 
 	if(!finished)
 	switch(b) {
@@ -1750,7 +1750,7 @@
 	    it = transfers.end();
 
 	    if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
-		it = transfers.begin() + (int) db.getmenu()->getref(n-1);
+		it = transfers.begin() + (int)(long) db.getmenu()->getref(n-1);
 
 	    switch(b) {
 		case 0:
diff -ru centericq-4.21.0/src/icqface.cc centericq-4.21.0.new/src/icqface.cc
--- centericq-4.21.0/src/icqface.cc	2006-01-01 17:29:10.701587568 +0100
+++ centericq-4.21.0.new/src/icqface.cc	2006-01-01 17:37:09.135854504 +0100
@@ -401,7 +401,7 @@
 
     m.scale();
     m.idle = &menuidle;
-    i = (int) m.getref(m.open()-1);
+    i = (int)(long) m.getref(m.open()-1);
     m.close();
 
     if(i) lastr = i;
@@ -450,7 +450,7 @@
 
     if(i) {
 	lastitem = i-1;
-	r = (int) m.getref(lastitem);
+	r = (int)(long) m.getref(lastitem);
     }
 
     return r;
@@ -513,7 +513,7 @@
 	    g = 0;
 	}
 	
-	if((unsigned int) c < 100) c = 0;
+	if((unsigned int)(long) c < 100) c = 0;
 
 	if(i) {
 	    switch(action = extk) {
@@ -1484,7 +1484,7 @@
 	m.scale();
 
 	i = m.open();
-	choice = (int) m.getref(i-1);
+	choice = (int)(long) m.getref(i-1);
 
 	m.close();
     }
@@ -1539,7 +1539,7 @@
 	m.close();
 
 	if(r = i) {
-	    st = (imstatus) ((int) m.getref(i-1));
+	    st = (imstatus) ((int)(long) m.getref(i-1));
 	}
     }
 
@@ -2132,7 +2132,7 @@
 			    c = (icqcontact *) cm->getref(i);
 			}
 
-			if((unsigned int) c > 100) {
+			if((unsigned int)(long) c > 100) {
 			    string current = c->getdispnick();
 			    len = current.size();
 			    if(len > nick.size()) len = nick.size();