syscall: make windows build again after d3963c0fca78 change

R=rsc, mikioh.mikioh
CC=golang-dev
https://golang.org/cl/5373097

diff --git a/src/pkg/os/exec_windows.go b/src/pkg/os/exec_windows.go
index 46adb050d8b272b62c7cde3c2509bb300074c5de..c4c9dcfe8292d72418c816ec3810bb5b2b53fa33 100644 (file)
--- a/src/pkg/os/exec_windows.go
+++ b/src/pkg/os/exec_windows.go
@@ -8,6 +8,7 @@ import (
        "errors"
        "runtime"
        "syscall"
+       "unsafe"
 )
 
 func (p *Process) Wait(options int) (w *Waitmsg, err error) {
@@ -68,14 +69,14 @@ func FindProcess(pid int) (p *Process, err error) {
 
 func init() {
        var argc int32
-       cmd := GetCommandLine()
-       argv, e := CommandLineToArgv(cmd, &argc)
+       cmd := syscall.GetCommandLine()
+       argv, e := syscall.CommandLineToArgv(cmd, &argc)
        if e != nil {
                return
        }
-       defer LocalFree(Handle(uintptr(unsafe.Pointer(argv))))
+       defer syscall.LocalFree(syscall.Handle(uintptr(unsafe.Pointer(argv))))
        Args = make([]string, argc)
        for i, v := range (*argv)[:argc] {
-               Args[i] = string(UTF16ToString((*v)[:]))
+               Args[i] = string(syscall.UTF16ToString((*v)[:]))
        }
 }

diff --git a/src/pkg/os/file_windows.go b/src/pkg/os/file_windows.go
index 5b098880f4cebb71534cfcb1e49e66eb8686b8e8..94624266f8c9bfab506f045c7679c0ec1b3e3f22 100644 (file)
--- a/src/pkg/os/file_windows.go
+++ b/src/pkg/os/file_windows.go
@@ -9,6 +9,7 @@ import (
        "runtime"
        "sync"
        "syscall"
+       "unicode/utf16"
 )
 
 // File represents an open file descriptor.
@@ -299,7 +300,7 @@ func Pipe() (r *File, w *File, err error) {
 // TempDir returns the default directory to use for temporary files.
 func TempDir() string {
        const pathSep = '\\'
-       dirw := make([]uint16, MAX_PATH)
+       dirw := make([]uint16, syscall.MAX_PATH)
        n, _ := syscall.GetTempPath(uint32(len(dirw)), &dirw[0])
        if n > uint32(len(dirw)) {
                dirw = make([]uint16, n)

diff --git a/src/pkg/runtime/windows/thread.c b/src/pkg/runtime/windows/thread.c
index aec78509d53c7aa9c8956930f92f729d439679f2..9abc9cd728e63580925f869eb409ae11ac60cd29 100644 (file)
--- a/src/pkg/runtime/windows/thread.c
+++ b/src/pkg/runtime/windows/thread.c
@@ -81,7 +81,7 @@ runtime·osinit(void)
 void
 runtime·goenvs(void)
 {
-       extern Slice os·Envs;
+       extern Slice syscall·envs;
 
        uint16 *env;
        String *s;
@@ -101,9 +101,9 @@ runtime·goenvs(void)
                s[i] = runtime·gostringw(p);
                p += runtime·findnullw(p)+1;
        }
-       os·Envs.array = (byte*)s;
-       os·Envs.len = n;
-       os·Envs.cap = n;
+       syscall·envs.array = (byte*)s;
+       syscall·envs.len = n;
+       syscall·envs.cap = n;
 
        runtime·stdcall(runtime·FreeEnvironmentStringsW, 1, env);
 }

diff --git a/src/pkg/syscall/env_windows.go b/src/pkg/syscall/env_windows.go
index 8c1c4271a28319e4c4ec88f92a05f450f0c88e45..8308f10a2dc0df56552ca15b9ac52564c03d8141 100644 (file)
--- a/src/pkg/syscall/env_windows.go
+++ b/src/pkg/syscall/env_windows.go
@@ -7,7 +7,6 @@
 package syscall
 
 import (
-       "errors"
        "unicode/utf16"
        "unsafe"
 )

diff --git a/src/pkg/syscall/mkerrors_windows.sh b/src/pkg/syscall/mkerrors_windows.sh
index a76f250fda84e78f866f6d1b983c78ef2f60a369..13badcd92ed646f7207ed8418681e7509c9040cb 100755 (executable)
--- a/src/pkg/syscall/mkerrors_windows.sh
+++ b/src/pkg/syscall/mkerrors_windows.sh
@@ -158,7 +158,7 @@ main(void)
        printf("\n// Go names for Windows errors.\n");
        printf("const (\n");
        for(i=0; i<nelem(goerrors); i++) {
-               printf("\t%s = %s\n", goerrors[i].goname, goerrors[i].winname);
+               printf("\t%s Errno = %s\n", goerrors[i].goname, goerrors[i].winname);
                        
        }
        printf(")\n");
@@ -171,7 +171,7 @@ main(void)
        for(i=0; i<nelem(errors); i++) {
                printf("\t%s", errors[i].name);
                if(iota) {
-                       printf(" = APPLICATION_ERROR + iota");
+                       printf(" Errno = APPLICATION_ERROR + iota");
                        iota = !iota;
                }
                printf("\n");

diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index 2c0cc5401f69f1ca9691a206d28410b6a027dd1f..de3cb6d49ac732bdcb5e3996d67effc88f8bbd7b 100644 (file)
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -357,11 +357,6 @@ func Gettimeofday(tv *Timeval) (err error) {
        return nil
 }
 
-func Sleep(nsec int64) (err error) {
-       sleep(uint32((nsec + 1e6 - 1) / 1e6)) // round up to milliseconds
-       return nil
-}
-
 func Pipe(p []Handle) (err error) {
        if len(p) != 2 {
                return EINVAL

diff --git a/src/pkg/syscall/zerrors_windows.go b/src/pkg/syscall/zerrors_windows.go
index 24d862f230b03a471917accf3106a68ec08a83f8..afdeae2bc62a10fa14661378b45af55784e4b332 100644 (file)
--- a/src/pkg/syscall/zerrors_windows.go
+++ b/src/pkg/syscall/zerrors_windows.go
@@ -1,4 +1,4 @@
-// mkerrors_windows.sh -f -m32
+// mkerrors_windows.sh -m32
 // MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 
 package syscall