summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--rwcancel/fdset.go2
-rw-r--r--rwcancel/rwcancel.go4
-rw-r--r--rwcancel/rwcancel_windows.go8
-rw-r--r--rwcancel/select_default.go5
4 files changed, 17 insertions, 2 deletions
diff --git a/rwcancel/fdset.go b/rwcancel/fdset.go
index 28746e6..91bd757 100644
--- a/rwcancel/fdset.go
+++ b/rwcancel/fdset.go
@@ -1,3 +1,5 @@
+// +build !windows
+
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
diff --git a/rwcancel/rwcancel.go b/rwcancel/rwcancel.go
index 808e691..3c4a9ed 100644
--- a/rwcancel/rwcancel.go
+++ b/rwcancel/rwcancel.go
@@ -1,8 +1,12 @@
+// +build !windows
+
/* SPDX-License-Identifier: MIT
*
* Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved.
*/
+// Package rwcancel implements cancelable read/write operations on
+// a file descriptor.
package rwcancel
import (
diff --git a/rwcancel/rwcancel_windows.go b/rwcancel/rwcancel_windows.go
new file mode 100644
index 0000000..0316911
--- /dev/null
+++ b/rwcancel/rwcancel_windows.go
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+
+package rwcancel
+
+type RWCancel struct {
+}
+
+func (*RWCancel) Cancel() {}
diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go
index dd23cda..82e07dc 100644
--- a/rwcancel/select_default.go
+++ b/rwcancel/select_default.go
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!windows
/* SPDX-License-Identifier: MIT
*
@@ -10,5 +10,6 @@ package rwcancel
import "golang.org/x/sys/unix"
func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
- return unix.Select(nfd, r, w, e, timeout)
+ _, err := unix.Select(nfd, r, w, e, timeout)
+ return err
}