diff options
author | Felix Lange <fjl@twurst.com> | 2016-08-30 18:43:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-30 18:43:10 +0800 |
commit | 3e7b4ae0c3fda9d71bcae4274b0af4b075977b8b (patch) | |
tree | 596d8881580b2812d4a65e50ea14962cbea8334a /Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go | |
parent | 969008dbb007bb3f05dd6f66b5a91cb38c21ab54 (diff) | |
parent | 3b75d0ce2373c6e6da9af5f341d2d0aae0b4ed96 (diff) | |
download | go-tangerine-3e7b4ae0c3fda9d71bcae4274b0af4b075977b8b.tar.gz go-tangerine-3e7b4ae0c3fda9d71bcae4274b0af4b075977b8b.tar.zst go-tangerine-3e7b4ae0c3fda9d71bcae4274b0af4b075977b8b.zip |
Merge pull request #2967 from fjl/godeps-update
Godeps: update golang.org/x/...
Diffstat (limited to 'Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go')
-rw-r--r-- | Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go b/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go index d5275875f..7dea79a8e 100644 --- a/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go +++ b/Godeps/_workspace/src/golang.org/x/sys/unix/types_linux.go @@ -24,6 +24,7 @@ package unix #include <netinet/in.h> #include <netinet/tcp.h> #include <netpacket/packet.h> +#include <poll.h> #include <signal.h> #include <stdio.h> #include <sys/epoll.h> @@ -55,6 +56,8 @@ package unix #include <unistd.h> #include <ustat.h> #include <utime.h> +#include <bluetooth/bluetooth.h> +#include <bluetooth/hci.h> #ifdef TCSETS2 // On systems that have "struct termios2" use this as type Termios. @@ -98,17 +101,33 @@ typedef struct user_regs PtraceRegs; typedef struct user_pt_regs PtraceRegs; #elif defined(__powerpc64__) typedef struct pt_regs PtraceRegs; +#elif defined(__mips__) +typedef struct user PtraceRegs; +#elif defined(__s390x__) +typedef struct _user_regs_struct PtraceRegs; #else typedef struct user_regs_struct PtraceRegs; #endif +#if defined(__s390x__) +typedef struct _user_psw_struct ptracePsw; +typedef struct _user_fpregs_struct ptraceFpregs; +typedef struct _user_per_struct ptracePer; +#else +typedef struct {} ptracePsw; +typedef struct {} ptraceFpregs; +typedef struct {} ptracePer; +#endif + // The real epoll_event is a union, and godefs doesn't handle it well. struct my_epoll_event { uint32_t events; -#ifdef __ARM_EABI__ +#if defined(__ARM_EABI__) || defined(__aarch64__) // padding is not specified in linux/eventpoll.h but added to conform to the // alignment requirements of EABI int32_t padFd; +#elif defined(__powerpc64__) || defined(__s390x__) + int32_t _padFd; #endif int32_t fd; int32_t pad; @@ -194,6 +213,8 @@ type RawSockaddrLinklayer C.struct_sockaddr_ll type RawSockaddrNetlink C.struct_sockaddr_nl +type RawSockaddrHCI C.struct_sockaddr_hci + type RawSockaddr C.struct_sockaddr type RawSockaddrAny C.struct_sockaddr_any @@ -233,6 +254,7 @@ const ( SizeofSockaddrUnix = C.sizeof_struct_sockaddr_un SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll SizeofSockaddrNetlink = C.sizeof_struct_sockaddr_nl + SizeofSockaddrHCI = C.sizeof_struct_sockaddr_hci SizeofLinger = C.sizeof_struct_linger SizeofIPMreq = C.sizeof_struct_ip_mreq SizeofIPMreqn = C.sizeof_struct_ip_mreqn @@ -383,6 +405,13 @@ const SizeofInotifyEvent = C.sizeof_struct_inotify_event // Register structures type PtraceRegs C.PtraceRegs +// Structures contained in PtraceRegs on s390x (exported by mkpost.go) +type ptracePsw C.ptracePsw + +type ptraceFpregs C.ptraceFpregs + +type ptracePer C.ptracePer + // Misc type FdSet C.fd_set @@ -398,9 +427,24 @@ type EpollEvent C.struct_my_epoll_event const ( AT_FDCWD = C.AT_FDCWD AT_REMOVEDIR = C.AT_REMOVEDIR + AT_SYMLINK_FOLLOW = C.AT_SYMLINK_FOLLOW AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW ) +type PollFd C.struct_pollfd + +const ( + POLLIN = C.POLLIN + POLLPRI = C.POLLPRI + POLLOUT = C.POLLOUT + POLLRDHUP = C.POLLRDHUP + POLLERR = C.POLLERR + POLLHUP = C.POLLHUP + POLLNVAL = C.POLLNVAL +) + +type Sigset_t C.sigset_t + // Terminal handling type Termios C.termios_t |