evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes warning: 'X' is not defined, evaluates to 0 [-Werror,-Wundef]

Browse source
This commit is contained in:
Oliver Jones 2012-11-30 18:12:47 +11:00
parent 692f7126ca
commit b75c673a2c
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AFNetworking/AFHTTPClient.m
View file

@ -35,7 +35,7 @@
#import <netdb.h> #import <netdb.h>
#endif #endif
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#endif #endif
@ -230,10 +230,10 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) {
NSString *preferredLanguageCodes = [[NSLocale preferredLanguages] componentsJoinedByString:@", "]; NSString *preferredLanguageCodes = [[NSLocale preferredLanguages] componentsJoinedByString:@", "];
[self setDefaultHeader:@"Accept-Language" value:[NSString stringWithFormat:@"%@, en-us;q=0.8", preferredLanguageCodes]]; [self setDefaultHeader:@"Accept-Language" value:[NSString stringWithFormat:@"%@, en-us;q=0.8", preferredLanguageCodes]];
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
// User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43 // User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43
[self setDefaultHeader:@"User-Agent" value:[NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleIdentifierKey], (__bridge id)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey) ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey], [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], ([[UIScreen mainScreen] respondsToSelector:@selector(scale)] ? [[UIScreen mainScreen] scale] : 1.0f)]]; [self setDefaultHeader:@"User-Agent" value:[NSString stringWithFormat:@"%@/%@ (%@; iOS %@; Scale/%0.2f)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleIdentifierKey], (__bridge id)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey) ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey], [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], ([[UIScreen mainScreen] respondsToSelector:@selector(scale)] ? [[UIScreen mainScreen] scale] : 1.0f)]];
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
[self setDefaultHeader:@"User-Agent" value:[NSString stringWithFormat:@"%@/%@ (Mac OS X %@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleIdentifierKey], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey], [[NSProcessInfo processInfo] operatingSystemVersionString]]]; [self setDefaultHeader:@"User-Agent" value:[NSString stringWithFormat:@"%@/%@ (Mac OS X %@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleExecutableKey] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleIdentifierKey], [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] ?: [[[NSBundle mainBundle] infoDictionary] objectForKey:(NSString *)kCFBundleVersionKey], [[NSProcessInfo processInfo] operatingSystemVersionString]]];
#endif #endif

24
AFNetworking/AFImageRequestOperation.m
View file

@ -32,20 +32,20 @@ static dispatch_queue_t image_request_operation_processing_queue() {
} }
@interface AFImageRequestOperation () @interface AFImageRequestOperation ()
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
@property (readwrite, nonatomic, strong) UIImage *responseImage; @property (readwrite, nonatomic, strong) UIImage *responseImage;
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
@property (readwrite, nonatomic, strong) NSImage *responseImage; @property (readwrite, nonatomic, strong) NSImage *responseImage;
#endif #endif
@end @end
@implementation AFImageRequestOperation @implementation AFImageRequestOperation
@synthesize responseImage = _responseImage; @synthesize responseImage = _responseImage;
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
@synthesize imageScale = _imageScale; @synthesize imageScale = _imageScale;
#endif #endif
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+ (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest + (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest
success:(void (^)(UIImage *image))success success:(void (^)(UIImage *image))success
{ {
@ -55,7 +55,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
} }
} failure:nil]; } failure:nil];
} }
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+ (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest + (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest
success:(void (^)(NSImage *image))success success:(void (^)(NSImage *image))success
{ {
@ -68,7 +68,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
#endif #endif
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+ (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest + (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest
imageProcessingBlock:(UIImage *(^)(UIImage *))imageProcessingBlock imageProcessingBlock:(UIImage *(^)(UIImage *))imageProcessingBlock
success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image))success
@ -99,7 +99,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
return requestOperation; return requestOperation;
} }
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+ (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest + (AFImageRequestOperation *)imageRequestOperationWithRequest:(NSURLRequest *)urlRequest
imageProcessingBlock:(NSImage *(^)(NSImage *))imageProcessingBlock imageProcessingBlock:(NSImage *(^)(NSImage *))imageProcessingBlock
success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSImage *image))success success:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSImage *image))success
@ -137,7 +137,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
return nil; return nil;
} }
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
self.imageScale = [[UIScreen mainScreen] scale]; self.imageScale = [[UIScreen mainScreen] scale];
#endif #endif
@ -145,7 +145,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
} }
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
- (UIImage *)responseImage { - (UIImage *)responseImage {
if (!_responseImage && [self.responseData length] > 0 && [self isFinished]) { if (!_responseImage && [self.responseData length] > 0 && [self isFinished]) {
UIImage *image = [UIImage imageWithData:self.responseData]; UIImage *image = [UIImage imageWithData:self.responseData];
@ -168,7 +168,7 @@ static dispatch_queue_t image_request_operation_processing_queue() {
self.responseImage = nil; self.responseImage = nil;
} }
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
- (NSImage *)responseImage { - (NSImage *)responseImage {
if (!_responseImage && [self.responseData length] > 0 && [self isFinished]) { if (!_responseImage && [self.responseData length] > 0 && [self isFinished]) {
// Ensure that the image is set to it's correct pixel width and height // Ensure that the image is set to it's correct pixel width and height
@ -216,9 +216,9 @@ static dispatch_queue_t image_request_operation_processing_queue() {
} }
} else { } else {
if (success) { if (success) {
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
UIImage *image = nil; UIImage *image = nil;
#elif __MAC_OS_X_VERSION_MIN_REQUIRED #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
NSImage *image = nil; NSImage *image = nil;
#endif #endif

2
AFNetworking/AFNetworking.h
View file

@ -36,7 +36,7 @@
#import "AFImageRequestOperation.h" #import "AFImageRequestOperation.h"
#if __IPHONE_OS_VERSION_MIN_REQUIRED #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
#import "AFNetworkActivityIndicatorManager.h" #import "AFNetworkActivityIndicatorManager.h"
#import "UIImageView+AFNetworking.h" #import "UIImageView+AFNetworking.h"
#endif #endif