Freebsd is finally normal in sys/unix

diff --git a/rwcancel/fdset_default.go b/rwcancel/fdset.go
similarity index 95%
rename from rwcancel/fdset_default.go
rename to rwcancel/fdset.go
index f8a4b250a8200990ce236ff178d7b7182c8a4135..b393b18674706a9184745ecbec6a6dcd5d2c0307 100644 (file)
--- a/rwcancel/fdset_default.go
+++ b/rwcancel/fdset.go
@@ -1,5 +1,3 @@
-// +build !freebsd
-
 /* SPDX-License-Identifier: GPL-2.0
  *
  * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.

diff --git a/rwcancel/fdset_freebsd.go b/rwcancel/fdset_freebsd.go
deleted file mode 100644 (file)
index 0c115c1..0000000
--- a/rwcancel/fdset_freebsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0
- *
- * Copyright (C) 2017-2018 WireGuard LLC. All Rights Reserved.
- */
-
-package rwcancel
-
-import "golang.org/x/sys/unix"
-
-type fdSet struct {
-       fdset unix.FdSet
-}
-
-func (fdset *fdSet) set(i int) {
-       bits := 32 << (^uint(0) >> 63)
-       fdset.fdset.X__fds_bits[i/bits] |= 1 << uint(i%bits)
-}
-
-func (fdset *fdSet) check(i int) bool {
-       bits := 32 << (^uint(0) >> 63)
-       return (fdset.fdset.X__fds_bits[i/bits] & (1 << uint(i%bits))) != 0
-}