qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 12:18:33 -06:00
Code Releases Activity

runtime: make fcntl arguments consistent across OS's

Browse Source 
The C fnctl takes all int parameters, so consistently use int32.
We already used int32 on Darwin.

Change-Id: I69a012145d012771d7308d705d133159fc1aceaa
Reviewed-on: https://go-review.googlesource.com/c/go/+/204101
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Ian Lance Taylor 2019-10-29 10:18:25 -07:00
parent 15ea61c50c
commit 47efbf0a4e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/netpoll_solaris.go
View File

@ -91,8 +91,8 @@ func errno() int32 {
return *getg().m.perrno
}
func fcntl(fd, cmd int32, arg uintptr) int32 {
return int32(sysvicall3(&libc_fcntl, uintptr(fd), uintptr(cmd), arg))
func fcntl(fd, cmd, arg int32) int32 {
return int32(sysvicall3(&libc_fcntl, uintptr(fd), uintptr(cmd), uintptr(arg)))
}
func port_create() int32 {

6
src/runtime/os_aix.go
View File

@ -360,8 +360,8 @@ func setupSystemConf() {
}
//go:nosplit
func fcntl(fd, cmd int32, arg uintptr) int32 {
r, _ := syscall3(&libc_fcntl, uintptr(fd), uintptr(cmd), arg)
func fcntl(fd, cmd, arg int32) int32 {
r, _ := syscall3(&libc_fcntl, uintptr(fd), uintptr(cmd), uintptr(arg))
return int32(r)
}
@ -373,5 +373,5 @@ func closeonexec(fd int32) {
//go:nosplit
func setNonblock(fd int32) {
flags := fcntl(fd, _F_GETFL, 0)
fcntl(fd, _F_SETFL, uintptr(flags|_O_NONBLOCK))
fcntl(fd, _F_SETFL, flags|_O_NONBLOCK)
}