- Upgrade Sequel Pro to be compiled as a 3-way PPC/i386/x86_64 binary for release builds, including a large number of 64bit compatibility upgrades and tweaks

 - Upgrade RegexKitLite to 3.3

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/SPKeychain.m b/Source/SPKeychain.m
index e808d3ea..eecca884 100644
--- a/Source/SPKeychain.m
+++ b/Source/SPKeychain.m
@@ -199,7 +199,7 @@
 {
 	SecKeychainItemRef item;
 	SecKeychainSearchRef search = NULL;
-    int numberOfItemsFound = 0;
+    NSInteger numberOfItemsFound = 0;
 	SecKeychainAttributeList list;
 	SecKeychainAttribute attributes[2];
 
@@ -237,9 +237,10 @@
 {
 	NSString *keychainItemName;
 
-	keychainItemName = [NSString stringWithFormat:@"Sequel Pro : %@ (%i)",
+	// Look up the keychain name using long longs to support 64-bit > 32-bit keychain usage
+	keychainItemName = [NSString stringWithFormat:@"Sequel Pro : %@ (%lld)",
 							theName?theName:@"",
-							[theID intValue]];
+							[theID longLongValue]];
 
 	return keychainItemName;
 }
@@ -266,9 +267,10 @@
 {
 	NSString *sshKeychainItemName;
 
-	sshKeychainItemName = [NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@ (%i)",
+	// Look up the keychain name using long longs to support 64-bit > 32-bit keychain usage
+	sshKeychainItemName = [NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@ (%lld)",
 							theName?theName:@"",
-							[theID intValue]];
+							[theID longLongValue]];
 
 	return sshKeychainItemName;
 }