diff options
| author | Jay Freeman (saurik) <saurik@saurik.com> | 2017-02-04 06:38:23 -0800 |
|---|---|---|
| committer | Jay Freeman (saurik) <saurik@saurik.com> | 2017-02-04 06:38:23 -0800 |
| commit | 09e03d2385c301e68025da688831f50dd2e3734d (patch) | |
| tree | 55da302ceb05d2537ac86e3083b75b57b97095ea | |
| parent | ec89f5e6ae3a97b3f4f854f7baa35559e3d55457 (diff) | |
On 64-bit some of these floats are really CGFloat.v1.1.28
| -rw-r--r-- | CyteKit/WebViewController.mm | 2 | ||||
| -rw-r--r-- | iPhonePrivate.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 83c8e91..6692c6c 100644 --- 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"); - 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; diff --git a/iPhonePrivate.h b/iPhonePrivate.h index 46cde9f..19af1aa 100644 --- 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) setScrollDecelerationFactor:(float)factor; -- (void) setScrollHysteresis:(float)hysteresis; +- (void) setScrollDecelerationFactor:(CGFloat)factor; +- (void) setScrollHysteresis:(CGFloat)hysteresis; - (void) setScrollerIndicatorStyle:(UIScrollViewIndicatorStyle)style; - (void) setThumbDetectionEnabled:(BOOL)enabled; @end @@ -393,14 +393,14 @@ typedef enum { @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 -extern float const UIScrollViewDecelerationRateNormal; +extern CGFloat const UIScrollViewDecelerationRateNormal; #endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER // }}} |