diff options
author | Alex Brainman <alex.brainman@gmail.com> | 2015-04-27 17:32:23 +1000 |
---|---|---|
committer | Alex Brainman <alex.brainman@gmail.com> | 2015-06-19 01:47:11 +0000 |
commit | 9d968cb47b240f47b40809639a0a532e752f6a08 (patch) | |
tree | 76a1a2d9c59f66b2840c05b0234850e20b065a01 /src/runtime/syscall_windows.go | |
parent | 1a040c923035fbab613ef9f37422e91ac01ff911 (diff) | |
download | go-9d968cb47b240f47b40809639a0a532e752f6a08.tar.gz go-9d968cb47b240f47b40809639a0a532e752f6a08.zip |
runtime: rename cgocall_errno and asmcgocall_errno into cgocall and asmcgocall
Change-Id: I5917bea8bb35b0e725dcc56a68f3a70137cfc180
Reviewed-on: https://go-review.googlesource.com/9387
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/runtime/syscall_windows.go')
-rw-r--r-- | src/runtime/syscall_windows.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/runtime/syscall_windows.go b/src/runtime/syscall_windows.go index 370b1724d5..d2e44d761a 100644 --- a/src/runtime/syscall_windows.go +++ b/src/runtime/syscall_windows.go @@ -95,7 +95,7 @@ func syscall_loadlibrary(filename *uint16) (handle, err uintptr) { c.fn = getLoadLibrary() c.n = 1 c.args = uintptr(unsafe.Pointer(&filename)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) handle = c.r1 if handle == 0 { err = c.err @@ -110,7 +110,7 @@ func syscall_getprocaddress(handle uintptr, procname *byte) (outhandle, err uint c.fn = getGetProcAddress() c.n = 2 c.args = uintptr(unsafe.Pointer(&handle)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) outhandle = c.r1 if outhandle == 0 { err = c.err @@ -125,7 +125,7 @@ func syscall_Syscall(fn, nargs, a1, a2, a3 uintptr) (r1, r2, err uintptr) { c.fn = fn c.n = nargs c.args = uintptr(unsafe.Pointer(&a1)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) return c.r1, c.r2, c.err } @@ -136,7 +136,7 @@ func syscall_Syscall6(fn, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err ui c.fn = fn c.n = nargs c.args = uintptr(unsafe.Pointer(&a1)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) return c.r1, c.r2, c.err } @@ -147,7 +147,7 @@ func syscall_Syscall9(fn, nargs, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1 c.fn = fn c.n = nargs c.args = uintptr(unsafe.Pointer(&a1)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) return c.r1, c.r2, c.err } @@ -158,7 +158,7 @@ func syscall_Syscall12(fn, nargs, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, c.fn = fn c.n = nargs c.args = uintptr(unsafe.Pointer(&a1)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) return c.r1, c.r2, c.err } @@ -169,6 +169,6 @@ func syscall_Syscall15(fn, nargs, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, c.fn = fn c.n = nargs c.args = uintptr(unsafe.Pointer(&a1)) - cgocall_errno(asmstdcallAddr, unsafe.Pointer(&c)) + cgocall(asmstdcallAddr, unsafe.Pointer(&c)) return c.r1, c.r2, c.err } |