diff options
author | Ben Kochie <superq@gmail.com> | 2019-05-09 13:19:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-09 13:19:12 -0500 |
commit | f97f01c46cfde2ff97b5539b7964f3044c04947b (patch) | |
tree | 8029dd5630d8786f272aa127fe2c63ecced1b9c5 /vendor/golang.org/x/sys/unix/sockcmsg_unix.go | |
parent | 78820098702e41929c84619720e19c89f8b2cdae (diff) | |
download | prometheus_node_collector-1433885ddf8b0209cd197cff5a7b7f1e16777835.tar.bz2 prometheus_node_collector-1433885ddf8b0209cd197cff5a7b7f1e16777835.tar.xz prometheus_node_collector-1433885ddf8b0209cd197cff5a7b7f1e16777835.zip |
Update for 0.18.0 release (#1337)v0.18.0
* Update CHANGELOG for release.
* Bump VERSION.
* Update vendoring.
Signed-off-by: Ben Kochie <superq@gmail.com>
Diffstat (limited to 'vendor/golang.org/x/sys/unix/sockcmsg_unix.go')
-rw-r--r-- | vendor/golang.org/x/sys/unix/sockcmsg_unix.go | 11 |
1 files changed, 7 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 26e8b36..062bcab 100644 --- a/vendor/golang.org/x/sys/unix/sockcmsg_unix.go +++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix.go | |||
@@ -18,10 +18,13 @@ func cmsgAlignOf(salen int) int { | |||
18 | salign := SizeofPtr | 18 | salign := SizeofPtr |
19 | 19 | ||
20 | switch runtime.GOOS { | 20 | switch runtime.GOOS { |
21 | case "darwin", "dragonfly", "solaris": | 21 | case "aix": |
22 | // NOTE: It seems like 64-bit Darwin, DragonFly BSD and | 22 | // There is no alignment on AIX. |
23 | // Solaris kernels still require 32-bit aligned access to | 23 | salign = 1 |
24 | // network subsystem. | 24 | case "darwin", "dragonfly", "solaris", "illumos": |
25 | // NOTE: It seems like 64-bit Darwin, DragonFly BSD, | ||
26 | // illumos, and Solaris kernels still require 32-bit | ||
27 | // aligned access to network subsystem. | ||
25 | if SizeofPtr == 8 { | 28 | if SizeofPtr == 8 { |
26 | salign = 4 | 29 | salign = 4 |
27 | } | 30 | } |