diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-10-29 10:18:25 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-10-30 00:41:31 +0000 |
| commit | 47efbf0a4ec3e502b36dd0904c99d10775612228 (patch) | |
| tree | 6b32fb337b3dd38c8f0b689ed77d4e0bc6d7b4ab /src/runtime | |
| parent | 15ea61c50ca25295497e78354f7f8397e73e3590 (diff) | |
| download | go-47efbf0a4ec3e502b36dd0904c99d10775612228.tar.xz | |
runtime: make fcntl arguments consistent across OS's
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>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/netpoll_solaris.go | 4 | ||||
| -rw-r--r-- | src/runtime/os_aix.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/runtime/netpoll_solaris.go b/src/runtime/netpoll_solaris.go index fac4829ed1..26bbe38d86 100644 --- a/src/runtime/netpoll_solaris.go +++ b/src/runtime/netpoll_solaris.go @@ -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 { diff --git a/src/runtime/os_aix.go b/src/runtime/os_aix.go index ff2588f42f..9a6b8aec7c 100644 --- a/src/runtime/os_aix.go +++ b/src/runtime/os_aix.go @@ -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) } |