[release-branch.go1] syscall: unexport GetCurrentProcessId on Windows
diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index 562854f..6b544f1 100644
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -201,7 +201,7 @@
//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 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 787b146..7f75989 100644
--- a/src/pkg/syscall/zsyscall_windows_386.go
+++ b/src/pkg/syscall/zsyscall_windows_386.go
@@ -142,7 +142,7 @@
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 @@
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 e3dbced..821998d 100644
--- a/src/pkg/syscall/zsyscall_windows_amd64.go
+++ b/src/pkg/syscall/zsyscall_windows_amd64.go
@@ -142,7 +142,7 @@
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 @@
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
}
