diff options
author | Russ Cox <rsc@golang.org> | 2012-06-13 16:25:01 -0400 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2012-06-13 16:25:01 -0400 |
commit | 596e6f390b6a9a63a6b05399b4a0ef0dc26e26f7 (patch) | |
tree | b1efd520e03b81131dc73e957f0a1da053917e34 | |
parent | 96ab6e4a844df49738246c0758e69b72e4f71395 (diff) | |
download | go-596e6f390b6a9a63a6b05399b4a0ef0dc26e26f7.tar.gz go-596e6f390b6a9a63a6b05399b4a0ef0dc26e26f7.zip |
[release-branch.go1] syscall: unexport GetCurrentProcessId on Windows
-rw-r--r-- | src/pkg/syscall/syscall_windows.go | 4 | ||||
-rw-r--r-- | src/pkg/syscall/zsyscall_windows_386.go | 6 | ||||
-rw-r--r-- | src/pkg/syscall/zsyscall_windows_amd64.go | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go index 562854fc2e..6b544f1d4b 100644 --- a/src/pkg/syscall/syscall_windows.go +++ b/src/pkg/syscall/syscall_windows.go @@ -201,7 +201,7 @@ func NewCallback(fn interface{}) uintptr //sys RegQueryInfoKey(key Handle, class *uint16, classLen *uint32, reserved *uint32, subkeysLen *uint32, maxSubkeyLen *uint32, maxClassLen *uint32, valuesLen *uint32, maxValueNameLen *uint32, maxValueLen *uint32, saLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegQueryInfoKeyW //sys RegEnumKeyEx(key Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, class *uint16, classLen *uint32, lastWriteTime *Filetime) (regerrno error) = advapi32.RegEnumKeyExW //sys RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW -//sys GetCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId +//sys getCurrentProcessId() (pid uint32) = kernel32.getCurrentProcessId // syscall interface implementation for other packages @@ -684,7 +684,7 @@ func SetsockoptIPMreq(fd Handle, level, opt int, mreq *IPMreq) (err error) { } func SetsockoptIPv6Mreq(fd Handle, level, opt int, mreq *IPv6Mreq) (err error) { return EWINDOWS } -func Getpid() (pid int) { return int(GetCurrentProcessId()) } +func Getpid() (pid int) { return int(getCurrentProcessId()) } func FindFirstFile(name *uint16, data *Win32finddata) (handle Handle, err error) { // NOTE(rsc): The Win32finddata struct is wrong for the system call: diff --git a/src/pkg/syscall/zsyscall_windows_386.go b/src/pkg/syscall/zsyscall_windows_386.go index 787b14646d..7f75989220 100644 --- a/src/pkg/syscall/zsyscall_windows_386.go +++ b/src/pkg/syscall/zsyscall_windows_386.go @@ -142,7 +142,7 @@ var ( procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken") procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation") procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW") - procGetCurrentProcessId = modkernel32.NewProc("GetCurrentProcessId") + procgetCurrentProcessId = modkernel32.NewProc("getCurrentProcessId") ) func GetLastError() (lasterr error) { @@ -1602,8 +1602,8 @@ func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) { return } -func GetCurrentProcessId() (pid uint32) { - r0, _, _ := Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0) +func getCurrentProcessId() (pid uint32) { + r0, _, _ := Syscall(procgetCurrentProcessId.Addr(), 0, 0, 0, 0) pid = uint32(r0) return } diff --git a/src/pkg/syscall/zsyscall_windows_amd64.go b/src/pkg/syscall/zsyscall_windows_amd64.go index e3dbced060..821998d4db 100644 --- a/src/pkg/syscall/zsyscall_windows_amd64.go +++ b/src/pkg/syscall/zsyscall_windows_amd64.go @@ -142,7 +142,7 @@ var ( procOpenProcessToken = modadvapi32.NewProc("OpenProcessToken") procGetTokenInformation = modadvapi32.NewProc("GetTokenInformation") procGetUserProfileDirectoryW = moduserenv.NewProc("GetUserProfileDirectoryW") - procGetCurrentProcessId = modkernel32.NewProc("GetCurrentProcessId") + procgetCurrentProcessId = modkernel32.NewProc("getCurrentProcessId") ) func GetLastError() (lasterr error) { @@ -1602,8 +1602,8 @@ func GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) { return } -func GetCurrentProcessId() (pid uint32) { - r0, _, _ := Syscall(procGetCurrentProcessId.Addr(), 0, 0, 0, 0) +func getCurrentProcessId() (pid uint32) { + r0, _, _ := Syscall(procgetCurrentProcessId.Addr(), 0, 0, 0, 0) pid = uint32(r0) return } |