diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-17 16:51:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 16:51:25 -0400 |
| commit | d103ed6ca97ca5a2669f6cf5fe4b3d2a9c945f26 (patch) | |
| tree | dbde13123c6add150448f7b75753ac022d862475 /vendor/golang.org/x/sys/unix/sockcmsg_unix.go | |
| parent | cd23b8139a9463b67e3096744321f6f4eb0ca40a (diff) | |
| download | chat-d103ed6ca97ca5a2669f6cf5fe4b3d2a9c945f26.tar.gz chat-d103ed6ca97ca5a2669f6cf5fe4b3d2a9c945f26.tar.bz2 chat-d103ed6ca97ca5a2669f6cf5fe4b3d2a9c945f26.zip | |
Upgrading server dependancies (#6431)
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 f1493a3e6..bb756ece1 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) |