From 05cc0c829821d43cb45dc777e8dbde296304cbeb Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 11 Dec 2018 18:33:13 +0100
Subject: [PATCH] Freebsd is finally normal in sys/unix

---
 rwcancel/{fdset_default.go => fdset.go} |  2 --
 rwcancel/fdset_freebsd.go               | 22 ----------------------
 2 files changed, 24 deletions(-)
 rename rwcancel/{fdset_default.go => fdset.go} (95%)
 delete mode 100644 rwcancel/fdset_freebsd.go

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 f8a4b25..b393b18 100644
--- 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
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
-}