From cb8d01f58a0057b437b1a448f9d8ba25bcc6d8da Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 21 Sep 2019 21:13:54 +0200
Subject: mod: bump versions

---
 tun/wintun/iphlpapi/mksyscall.go     | 2 +-
 tun/wintun/namespace_windows.go      | 2 +-
 tun/wintun/namespaceapi/mksyscall.go | 2 +-
 tun/wintun/nci/mksyscall.go          | 2 +-
 tun/wintun/registry/mksyscall.go     | 2 +-
 tun/wintun/setupapi/mksyscall.go     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tun')

diff --git a/tun/wintun/iphlpapi/mksyscall.go b/tun/wintun/iphlpapi/mksyscall.go
index f2639ea..fc7dba4 100644
--- a/tun/wintun/iphlpapi/mksyscall.go
+++ b/tun/wintun/iphlpapi/mksyscall.go
@@ -5,4 +5,4 @@
 
 package iphlpapi
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go conversion_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go conversion_windows.go
diff --git a/tun/wintun/namespace_windows.go b/tun/wintun/namespace_windows.go
index 4530aee..f4316fe 100644
--- a/tun/wintun/namespace_windows.go
+++ b/tun/wintun/namespace_windows.go
@@ -37,7 +37,7 @@ func initializeNamespace() error {
 	}
 	wintunObjectSecurityAttributes = &windows.SecurityAttributes{
 		Length:             uint32(unsafe.Sizeof(windows.SecurityAttributes{})),
-		SecurityDescriptor: uintptr(unsafe.Pointer(sd)),
+		SecurityDescriptor: sd,
 	}
 	sid, err := windows.CreateWellKnownSid(windows.WinLocalSystemSid)
 	if err != nil {
diff --git a/tun/wintun/namespaceapi/mksyscall.go b/tun/wintun/namespaceapi/mksyscall.go
index c4c9595..93d43b0 100644
--- a/tun/wintun/namespaceapi/mksyscall.go
+++ b/tun/wintun/namespaceapi/mksyscall.go
@@ -5,4 +5,4 @@
 
 package namespaceapi
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go namespaceapi_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go namespaceapi_windows.go
diff --git a/tun/wintun/nci/mksyscall.go b/tun/wintun/nci/mksyscall.go
index 15408f4..019da93 100644
--- a/tun/wintun/nci/mksyscall.go
+++ b/tun/wintun/nci/mksyscall.go
@@ -5,4 +5,4 @@
 
 package nci
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go nci_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsyscall_windows.go nci_windows.go
diff --git a/tun/wintun/registry/mksyscall.go b/tun/wintun/registry/mksyscall.go
index d0cac6c..6ad82d2 100644
--- a/tun/wintun/registry/mksyscall.go
+++ b/tun/wintun/registry/mksyscall.go
@@ -5,4 +5,4 @@
 
 package registry
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zregistry_windows.go registry_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zregistry_windows.go registry_windows.go
diff --git a/tun/wintun/setupapi/mksyscall.go b/tun/wintun/setupapi/mksyscall.go
index 3447dee..ac103a1 100644
--- a/tun/wintun/setupapi/mksyscall.go
+++ b/tun/wintun/setupapi/mksyscall.go
@@ -5,4 +5,4 @@
 
 package setupapi
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsetupapi_windows.go setupapi_windows.go
+//go:generate go run golang.org/x/sys/windows/mkwinsyscall -output zsetupapi_windows.go setupapi_windows.go
-- 
cgit v1.2.3