tags 624962 + patch
kthxbye

Attached is a patch to fix the FTBFS with GCC 4.6.  In both cases, it
appears that someone is intentionally trying to stuff an integer in a
pointer, so I essentially made the integer type a long so that it would
work on both 32-bit and 64-bit systems.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
diff -ur sword.old/src/modules/swmodule.cpp sword-1.6.1+dfsg/src/modules/swmodule.cpp
--- sword.old/src/modules/swmodule.cpp	2011-05-26 21:48:08.000000000 +0000
+++ sword-1.6.1+dfsg/src/modules/swmodule.cpp	2011-05-26 22:05:28.000000000 +0000
@@ -536,7 +536,7 @@
 					}
 				}
 				listKey << *resultKey;
-				listKey.GetElement()->userData = (void *)((__u32)(h->score(i)*100));
+				listKey.GetElement()->userData = (void *)((long)(h->score(i)*100));
 			}
 			(*percent)(98, percentUserData);
 		}
diff -ur sword.old/tests/ciphertest.cpp sword-1.6.1+dfsg/tests/ciphertest.cpp
--- sword.old/tests/ciphertest.cpp	2011-05-26 21:48:08.000000000 +0000
+++ sword-1.6.1+dfsg/tests/ciphertest.cpp	2011-05-26 22:09:42.000000000 +0000
@@ -30,7 +30,7 @@
 	}
 
 	
-	int encipher = atoi(argv[2]);
+	long encipher = atoi(argv[2]);
 
 	SWFilter *filter = new CipherFilter(argv[1]);
 

Attachment: signature.asc
Description: Digital signature

Reply via email to