Skip to content

Commit e756a6d

Browse files
authored
Merge pull request #89 from Daemonson/master
Fix compile error in Xcode9-beta3
2 parents 001daba + ed0221d commit e756a6d

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ DerivedData
1515
*.ipa
1616
*.xcuserstate
1717
project.xcworkspace
18+
.DS_Store

RealReachability/Ping/PingFoundation.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ struct ICMPHeader
276276
};
277277
typedef struct ICMPHeader ICMPHeader;
278278

279-
check_compile_time(sizeof(ICMPHeader) == 8);
280-
check_compile_time(offsetof(ICMPHeader, type) == 0);
281-
check_compile_time(offsetof(ICMPHeader, code) == 1);
282-
check_compile_time(offsetof(ICMPHeader, checksum) == 2);
283-
check_compile_time(offsetof(ICMPHeader, identifier) == 4);
284-
check_compile_time(offsetof(ICMPHeader, sequenceNumber) == 6);
279+
__Check_Compile_Time(sizeof(ICMPHeader) == 8);
280+
__Check_Compile_Time(offsetof(ICMPHeader, type) == 0);
281+
__Check_Compile_Time(offsetof(ICMPHeader, code) == 1);
282+
__Check_Compile_Time(offsetof(ICMPHeader, checksum) == 2);
283+
__Check_Compile_Time(offsetof(ICMPHeader, identifier) == 4);
284+
__Check_Compile_Time(offsetof(ICMPHeader, sequenceNumber) == 6);
285285

testRealReachability.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
320320
GCC_WARN_UNUSED_FUNCTION = YES;
321321
GCC_WARN_UNUSED_VARIABLE = YES;
322-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
322+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
323323
MTL_ENABLE_DEBUG_INFO = YES;
324324
ONLY_ACTIVE_ARCH = YES;
325325
SDKROOT = iphoneos;
@@ -356,7 +356,7 @@
356356
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
357357
GCC_WARN_UNUSED_FUNCTION = YES;
358358
GCC_WARN_UNUSED_VARIABLE = YES;
359-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
359+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
360360
MTL_ENABLE_DEBUG_INFO = NO;
361361
SDKROOT = iphoneos;
362362
VALIDATE_PRODUCT = YES;
@@ -368,7 +368,7 @@
368368
buildSettings = {
369369
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
370370
INFOPLIST_FILE = testRealReachability/Info.plist;
371-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
371+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
372372
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
373373
PRODUCT_BUNDLE_IDENTIFIER = qc.testRealReachability;
374374
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -380,7 +380,7 @@
380380
buildSettings = {
381381
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
382382
INFOPLIST_FILE = testRealReachability/Info.plist;
383-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
383+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
384384
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
385385
PRODUCT_BUNDLE_IDENTIFIER = qc.testRealReachability;
386386
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)