memmod: apply explicit build tags to _32 and _64 files

Since _32 and _64 aren't valid goarchs, they don't match _GOOS_GOARCH,
and so the existing tags wind up not being restricted to windows-only.
This fixes the problem by adding windows to the tags explicitly. We
could also fix it by calling the files _32_windows or _64_windows, but
that changes the convention with the other single-arch files.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/tun/wintun/memmod/memmod_windows_32.go b/tun/wintun/memmod/memmod_windows_32.go
index bd2e254ceaf559addab2c53b5f6cdb66a67f57f7..bb0f5e3c14e795ca008cd155a0e833cd583c382d 100644 (file)
--- a/tun/wintun/memmod/memmod_windows_32.go
+++ b/tun/wintun/memmod/memmod_windows_32.go
@@ -1,4 +1,4 @@
-// +build 386 arm
+// +build windows,386 windows,arm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/memmod_windows_64.go b/tun/wintun/memmod/memmod_windows_64.go
index a66418fb6bcc6f2a47c82f7f07aea0deba877105..43c05539815742c728967bc6853a93e0885b1533 100644 (file)
--- a/tun/wintun/memmod/memmod_windows_64.go
+++ b/tun/wintun/memmod/memmod_windows_64.go
@@ -1,4 +1,4 @@
-// +build amd64 arm64
+// +build windows,amd64 windows,arm64
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/syscall_windows_32.go b/tun/wintun/memmod/syscall_windows_32.go
index 167d5fc9a36da0f26563c9772c93944a511fa058..09407c74d32fc5ab068addbfbe08443b5b93ac9f 100644 (file)
--- a/tun/wintun/memmod/syscall_windows_32.go
+++ b/tun/wintun/memmod/syscall_windows_32.go
@@ -1,4 +1,4 @@
-// +build 386 arm
+// +build windows,386 windows,arm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/syscall_windows_64.go b/tun/wintun/memmod/syscall_windows_64.go
index 888acc443aba3ad697e403673ed3ef76eec4c698..14a8b08975965d13734552f61b5f301fe15cfe4b 100644 (file)
--- a/tun/wintun/memmod/syscall_windows_64.go
+++ b/tun/wintun/memmod/syscall_windows_64.go
@@ -1,4 +1,4 @@
-// +build amd64 arm64
+// +build windows,amd64 windows,arm64
 
 /* SPDX-License-Identifier: MIT
  *