diff --git a/windows/mksyscall_windows.go b/windows/mksyscall_windows.go index d0700a80..03af3d0c 100644 --- a/windows/mksyscall_windows.go +++ b/windows/mksyscall_windows.go @@ -657,6 +657,7 @@ const srcTemplate = ` package {{packagename}} +import "syscall" import "unsafe"{{if windowsdot}} import "code.google.com/p/go.sys/windows"{{end}} diff --git a/windows/syscall_windows.go b/windows/syscall_windows.go index ca9dc8ad..7139a9ee 100644 --- a/windows/syscall_windows.go +++ b/windows/syscall_windows.go @@ -9,6 +9,7 @@ package windows import ( errorspkg "errors" "sync" + "syscall" "unicode/utf16" "unsafe" ) @@ -762,7 +763,7 @@ func LoadConnectEx() error { } func connectEx(s Handle, name unsafe.Pointer, namelen int32, sendBuf *byte, sendDataLen uint32, bytesSent *uint32, overlapped *Overlapped) (err error) { - r1, _, e1 := Syscall9(connectExFunc.addr, 7, uintptr(s), uintptr(name), uintptr(namelen), uintptr(unsafe.Pointer(sendBuf)), uintptr(sendDataLen), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), 0, 0) + r1, _, e1 := syscall.Syscall9(connectExFunc.addr, 7, uintptr(s), uintptr(name), uintptr(namelen), uintptr(unsafe.Pointer(sendBuf)), uintptr(sendDataLen), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), 0, 0) if r1 == 0 { if e1 != 0 { err = error(e1) diff --git a/windows/syscall_windows_test.go b/windows/syscall_windows_test.go index d8b129e3..85500a67 100644 --- a/windows/syscall_windows_test.go +++ b/windows/syscall_windows_test.go @@ -8,6 +8,7 @@ import ( "io/ioutil" "os" "path/filepath" + "syscall" "testing" "code.google.com/p/go.sys/windows" @@ -65,7 +66,7 @@ func ExampleLoadLibrary() { if err != nil { abort("GetProcAddress", err) } - r, _, _ := windows.Syscall(uintptr(proc), 0, 0, 0, 0) + r, _, _ := syscall.Syscall(uintptr(proc), 0, 0, 0, 0) major := byte(r) minor := uint8(r >> 8) build := uint16(r >> 16) diff --git a/windows/zsyscall_windows_386.go b/windows/zsyscall_windows_386.go index e71cea5b..d45ac1fc 100644 --- a/windows/zsyscall_windows_386.go +++ b/windows/zsyscall_windows_386.go @@ -3,6 +3,7 @@ package windows +import "syscall" import "unsafe" var ( diff --git a/windows/zsyscall_windows_amd64.go b/windows/zsyscall_windows_amd64.go index a11a5bd7..fb1839d7 100644 --- a/windows/zsyscall_windows_amd64.go +++ b/windows/zsyscall_windows_amd64.go @@ -3,6 +3,7 @@ package windows +import "syscall" import "unsafe" var (