On 64-bit some of these floats are really CGFloat.

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 83c8e91edc63190142371602d31fd5d70c0cae65..6692c6cbe232604b39c06641a14f8181b4b3fce7 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -146,7 +146,7 @@ float CYScrollViewDecelerationRateNormal;
     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 
     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 

-    if (float *_UIScrollViewDecelerationRateNormal = reinterpret_cast<float *>(dlsym(RTLD_DEFAULT, "UIScrollViewDecelerationRateNormal")))
+    if (CGFloat *_UIScrollViewDecelerationRateNormal = reinterpret_cast<CGFloat *>(dlsym(RTLD_DEFAULT, "UIScrollViewDecelerationRateNormal")))

         CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal;
     else // XXX: this actually might be fast on some older systems: we should look into this
         CYScrollViewDecelerationRateNormal = 0.998;
         CYScrollViewDecelerationRateNormal = *_UIScrollViewDecelerationRateNormal;
     else // XXX: this actually might be fast on some older systems: we should look into this
         CYScrollViewDecelerationRateNormal = 0.998;

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index 46cde9fa1710b7ede6becbc4f0a6cc8ecfe58f84..19af1aa0351e9905c6545ced49520d3fec343a08 100644 (file)
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -72,8 +72,8 @@ static const UIActivityIndicatorViewStyle UIActivityIndicatorViewStyleWhiteTiny(
 - (void) setDirectionalScrolling:(BOOL)directional;
 - (void) setEventMode:(NSInteger)mode;
 - (void) setOffset:(CGPoint)offset;
 - (void) setDirectionalScrolling:(BOOL)directional;
 - (void) setEventMode:(NSInteger)mode;
 - (void) setOffset:(CGPoint)offset;

-- (void) setScrollDecelerationFactor:(float)factor;
-- (void) setScrollHysteresis:(float)hysteresis;
+- (void) setScrollDecelerationFactor:(CGFloat)factor;
+- (void) setScrollHysteresis:(CGFloat)hysteresis;

 - (void) setScrollerIndicatorStyle:(UIScrollViewIndicatorStyle)style;
 - (void) setThumbDetectionEnabled:(BOOL)enabled;
 @end
 - (void) setScrollerIndicatorStyle:(UIScrollViewIndicatorStyle)style;
 - (void) setThumbDetectionEnabled:(BOOL)enabled;
 @end


@@ -393,14 +393,14 @@ typedef enum {
 @end
 
 @interface UIScrollView (iOS_3_0)
 @end
 
 @interface UIScrollView (iOS_3_0)

-@property(assign,nonatomic) float decelerationRate;
+@property(assign,nonatomic) CGFloat decelerationRate;

 @end
 
 @interface UIWebView (iOS_3_0)
 @property(assign,nonatomic) NSUInteger dataDetectorTypes;
 @end
 
 @end
 
 @interface UIWebView (iOS_3_0)
 @property(assign,nonatomic) NSUInteger dataDetectorTypes;
 @end
 

-extern float const UIScrollViewDecelerationRateNormal;
+extern CGFloat const UIScrollViewDecelerationRateNormal;

 
 #endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
 // }}}
 
 #endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
 // }}}