Skip to content

Commit 0cf0f71

Browse files
committed
---
yaml --- r: 349507 b: refs/heads/master-next c: 075acb0 h: refs/heads/master i: 349505: ea7e95d 349503: 50ed6e1
1 parent 2843307 commit 0cf0f71

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: 31f092027f764641e56db46e18a19786d2232dcf
3+
refs/heads/master-next: 075acb0415aca5e232d1f5df2037d992fadd764f
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/stdlib/public/stubs/Availability.mm

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@
2121
#include "swift/Runtime/Debug.h"
2222
#include <TargetConditionals.h>
2323
#include "../SwiftShims/FoundationShims.h"
24-
25-
#if __has_include(<os/system_version.h>)
26-
#include <os/system_version.h>
27-
28-
static os_system_version_s getOSVersion() {
29-
struct os_system_version_s vers = { 0, 0, 0 };
30-
os_system_version_get_current_version(&vers);
31-
return vers;
32-
}
33-
34-
#else
3524
#include <dlfcn.h>
3625

3726
struct os_system_version_s {
@@ -50,8 +39,6 @@ static os_system_version_s getOSVersion() {
5039
return vers;
5140
}
5241

53-
#endif
54-
5542
using namespace swift;
5643

5744
/// Return the version of the operating system currently running for use in

0 commit comments

Comments
 (0)