Skip to content

Commit

Permalink
Updated to latest (7/25) toolchain.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Abt committed Jul 26, 2016
1 parent 17b7943 commit 20d5645
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ Generic Cross Platform Signal Handler.
## Prerequisites

### Swift
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a` toolchain (**Minimum REQUIRED for latest release**)
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-07-25-a` toolchain (**Minimum REQUIRED for latest release**)

### macOS

* macOS 10.11.0 (*El Capitan*) or higher
* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*)
* macOS 10.11.6 (*El Capitan*) or higher
* Xcode Version 8.0 beta 3 (8S174q) or higher using the above toolchain (*Recommended*)

### Linux

Expand Down
4 changes: 3 additions & 1 deletion Signals.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
isa = PBXGroup;
children = (
8C30FB321CAAE0E000113F9D /* LICENSE */,
8C30FB331CAAE0E000113F9D /* README.md */,
__PBXFileRef_Package.swift /* Package.swift */,
8C30FB331CAAE0E000113F9D /* README.md */,
"_____Sources_" /* Sources */,
"_______Tests_" /* Tests */,
"____Products_" /* Products */,
Expand Down Expand Up @@ -152,12 +152,14 @@
"_____Release_" /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
SWIFT_VERSION = 3.0;
};
name = Release;
};
"_______Debug_" /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand Down
22 changes: 11 additions & 11 deletions Sources/Signals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// limitations under the License.
//

#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS)
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
import Darwin
import Foundation
#elseif os(Linux)
Expand Down Expand Up @@ -51,21 +51,21 @@ public class Signals {
public var valueOf: Int32 {

switch self {
case hup:
case .hup:
return Int32(SIGHUP)
case int:
case .int:
return Int32(SIGINT)
case quit:
case .quit:
return Int32(SIGQUIT)
case abrt:
case .abrt:
return Int32(SIGABRT)
case kill:
case .kill:
return Int32(SIGKILL)
case alrm:
case .alrm:
return Int32(SIGALRM)
case term:
case .term:
return Int32(SIGTERM)
case user(let sig):
case .user(let sig):
return Int32(sig)

}
Expand All @@ -92,7 +92,7 @@ public class Signals {
///
public class func trap(signal: Signal, action: SigActionHandler) {

#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS)
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

var signalAction = sigaction(__sigaction_u: unsafeBitCast(action, to: __sigaction_u.self), sa_mask: 0, sa_flags: 0)

Expand Down Expand Up @@ -147,7 +147,7 @@ public class Signals {
///
public class func raise(signal: Signal) {

#if os(OSX) || os(iOS) || os(tvOS) || os(watchOS)
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

_ = Darwin.raise(signal.valueOf)

Expand Down

0 comments on commit 20d5645

Please sign in to comment.