From 520019f6761e8b111c52b640759c672ed74774ab Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 12 Jul 2017 14:49:06 +0200 Subject: [PATCH] Windows: fix build after re-vendoring golang.org/x/sys Due to the CL https://go-review.googlesource.com/c/39608/ in x/sys/windows which changed the definitions of STD_INPUT_HANDLE, STD_OUTPUT_HANDLE and STD_ERROR_HANDLE, we get the following failure in cmd/dockerd/service_windows.go after re-vendoring x/sys/windows: 06:29:57 # github.com/docker/docker/cmd/dockerd 06:29:57 .\service_windows.go:400: cannot use sh (type int) as type uint32 in argument to windows.GetStdHandle Fix it by adding an explicit type conversion when calling windows.GetStdHandle. Signed-off-by: Tobias Klauser Upstream-commit: e769da88e6c6e94a397822dd8962cbcb83a402a0 Component: engine --- components/engine/cmd/dockerd/service_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/cmd/dockerd/service_windows.go b/components/engine/cmd/dockerd/service_windows.go index 87d57e41f6..0172169517 100644 --- a/components/engine/cmd/dockerd/service_windows.go +++ b/components/engine/cmd/dockerd/service_windows.go @@ -397,7 +397,7 @@ func initPanicFile(path string) error { // it when it panics. Remember the old stderr to restore it before removing // the panic file. sh := windows.STD_ERROR_HANDLE - h, err := windows.GetStdHandle(sh) + h, err := windows.GetStdHandle(uint32(sh)) if err != nil { return err }