Skip to content

Commit 21f9361

Browse files
committed
update no final
1 parent a79eba6 commit 21f9361

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

QiniuSDK/Common/QNPHAssetFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#import "QNFileDelegate.h"
1212

13-
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
13+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
1414
@class PHAsset;
1515
@interface QNPHAssetFile : NSObject<QNFileDelegate>
1616
/**

QiniuSDK/Common/QNPHAssetFile.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
#import "QNPHAssetFile.h"
1010

11-
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
12-
#pragma message("imported")
11+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
1312
#import <Photos/Photos.h>
1413

1514
enum {

QiniuSDK/Storage/QNUploadManager.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
#import "QNRecorderDelegate.h"
1212

13+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
14+
#import <Photos/Photos.h>
15+
#endif
16+
1317
@class QNResponseInfo;
1418
@class QNUploadOption;
1519
@class QNConfiguration;
@@ -131,8 +135,7 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
131135
* @param completionHandler 上传完成后的回调函数
132136
* @param option 上传时传入的可选参数
133137
*/
134-
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
135-
@class PHAsset;
138+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
136139
- (void) putPHAsset:(PHAsset *)asset
137140
key:(NSString *)key
138141
token:(NSString *)token

QiniuSDK/Storage/QNUploadManager.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
#import <CoreServices/CoreServices.h>
1818
#endif
1919

20-
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
20+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
2121
#import "QNPHAssetFile.h"
22-
#import <Photos/Photos.h>
2322
#endif
2423

2524
#import "QNConfiguration.h"
@@ -260,7 +259,7 @@ - (void) putALAsset:(ALAsset *)asset
260259
#endif
261260
}
262261

263-
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
262+
#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090)
264263
- (void) putPHAsset:(PHAsset *)asset
265264
key:(NSString *)key
266265
token:(NSString *)token

0 commit comments

Comments
 (0)