diff options
| author | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-06-08 10:54:14 -0700 |
|---|---|---|
| committer | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-06-15 22:32:35 -0700 |
| commit | d71b7f248e21f5254c32ecbf752a1dbe940a1177 (patch) | |
| tree | fd28a8f577ead500736cde46d8eb0647ae31415d /vendor/golang.org/x/sys/unix/sockcmsg_unix.go | |
| parent | ea3e258610340de0dd585c221f4e18a199f16bca (diff) | |
vendor: update x/sys/unix
This commit updates the vendored x/sys/unix to the current version. This
means that our vendored version of x/sys/unix no longer contains custom
patches. A few changes are needed in InsertPolicyKey() as the final API
differed slightly from our patches.
Change-Id: Ifff31c04e708f9dc4395ab5bfcc94e42fb46dea5
Diffstat (limited to 'vendor/golang.org/x/sys/unix/sockcmsg_unix.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go index f1493a3..bb756ec 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go @@ -1,4 +1,4 @@ -// Copyright 2011 The Go Authors. All rights reserved. +// Copyright 2011 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -13,9 +13,10 @@ import "unsafe" // Round the length of a raw sockaddr up to align it properly. func cmsgAlignOf(salen int) int { salign := sizeofPtr - // NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels - // still require 32-bit aligned access to network subsystem. - if darwin64Bit || dragonfly64Bit { + // NOTE: It seems like 64-bit Darwin, DragonFly BSD and + // Solaris kernels still require 32-bit aligned access to + // network subsystem. + if darwin64Bit || dragonfly64Bit || solaris64Bit { salign = 4 } return (salen + salign - 1) & ^(salign - 1) |