diff options
| author | Felix Lange <fjl@twurst.com> | 2017-01-11 02:33:17 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-01-11 05:33:24 +0800 |
| commit | d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e (patch) | |
| tree | dd03906433e1032a0b185910773206246d8a1556 /vendor/golang.org/x/sys/unix/types_linux.go | |
| parent | 02b67558e8eaa7b34a28b8dd0223824bbbb52349 (diff) | |
| download | go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar.gz go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar.bz2 go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar.lz go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar.xz go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.tar.zst go-tangerine-d78f9b834ade0f1ebcf2532bf90d01c85ad50a8e.zip | |
vendor: update all dependencies except Azure SDK
The Azure SDK doesn't support Go 1.5 anymore. We can't upgrade it until
Go 1.8 comes out.
Diffstat (limited to 'vendor/golang.org/x/sys/unix/types_linux.go')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/types_linux.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/golang.org/x/sys/unix/types_linux.go b/vendor/golang.org/x/sys/unix/types_linux.go index de80e2c8c..f3d8f90ee 100644 --- a/vendor/golang.org/x/sys/unix/types_linux.go +++ b/vendor/golang.org/x/sys/unix/types_linux.go @@ -58,6 +58,7 @@ package unix #include <utime.h> #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> +#include <linux/can.h> #ifdef TCSETS2 // On systems that have "struct termios2" use this as type Termios. @@ -125,7 +126,7 @@ typedef struct {} ptracePer; // The real epoll_event is a union, and godefs doesn't handle it well. struct my_epoll_event { uint32_t events; -#if defined(__ARM_EABI__) || defined(__aarch64__) +#if defined(__ARM_EABI__) || defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABIO32) // padding is not specified in linux/eventpoll.h but added to conform to the // alignment requirements of EABI int32_t padFd; @@ -218,6 +219,8 @@ type RawSockaddrNetlink C.struct_sockaddr_nl type RawSockaddrHCI C.struct_sockaddr_hci +type RawSockaddrCAN C.struct_sockaddr_can + type RawSockaddr C.struct_sockaddr type RawSockaddrAny C.struct_sockaddr_any @@ -258,6 +261,7 @@ const ( SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll SizeofSockaddrNetlink = C.sizeof_struct_sockaddr_nl SizeofSockaddrHCI = C.sizeof_struct_sockaddr_hci + SizeofSockaddrCAN = C.sizeof_struct_sockaddr_can SizeofLinger = C.sizeof_struct_linger SizeofIPMreq = C.sizeof_struct_ip_mreq SizeofIPMreqn = C.sizeof_struct_ip_mreqn |