Skip to content

S
sys
Commit 6035cb03 authored by Tobias Klauser's avatar Tobias Klauser Committed by Tobias Klauser
Browse files
Options

unix: don't export padding fields on Solaris 

Re-run ./mkall.sh to avoid exporting Pad_cgo* fields on solaris/amd64.
Akin to CL 89495.

Updates golang/go#18632

Change-Id: Ib80bf6376d0b7c0a5efd0f5d4a0f27e8e37d8abe
Reviewed-on: https://go-review.googlesource.com/100556
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarIan Lance Taylor <iant@golang.org>
parent 591c159d
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 87 deletions
unix/ztypes_solaris_amd64.go
View file @ 6035cb03
...@@ -93,40 +93,40 @@ const ( ...@@ -93,40 +93,40 @@ const (
) )
type Stat_t struct { type Stat_t struct {
Dev uint64 Dev uint64
Ino uint64 Ino uint64
Mode uint32 Mode uint32
Nlink uint32 Nlink uint32
Uid uint32 Uid uint32
Gid uint32 Gid uint32
Rdev uint64 Rdev uint64
Size int64 Size int64
Atim Timespec Atim Timespec
Mtim Timespec Mtim Timespec
Ctim Timespec Ctim Timespec
Blksize int32 Blksize int32
Pad_cgo_0 [4]byte _ [4]byte
Blocks int64 Blocks int64
Fstype [16]int8 Fstype [16]int8
} }
type Flock_t struct { type Flock_t struct {
Type int16 Type int16
Whence int16 Whence int16
Pad_cgo_0 [4]byte _ [4]byte
Start int64 Start int64
Len int64 Len int64
Sysid int32 Sysid int32
Pid int32 Pid int32
Pad [4]int64 Pad [4]int64
} }
type Dirent struct { type Dirent struct {
Ino uint64 Ino uint64
Off int64 Off int64
Reclen uint16 Reclen uint16
Name [1]int8 Name [1]int8
Pad_cgo_0 [5]byte _ [5]byte
} }
type _Fsblkcnt_t uint64 type _Fsblkcnt_t uint64
...@@ -213,13 +213,13 @@ type IPv6Mreq struct { ...@@ -213,13 +213,13 @@ type IPv6Mreq struct {
type Msghdr struct { type Msghdr struct {
Name *byte Name *byte
Namelen uint32 Namelen uint32
Pad_cgo_0 [4]byte _ [4]byte
Iov *Iovec Iov *Iovec
Iovlen int32 Iovlen int32
Pad_cgo_1 [4]byte _ [4]byte
Accrights *int8 Accrights *int8
Accrightslen int32 Accrightslen int32
Pad_cgo_2 [4]byte _ [4]byte
} }
type Cmsghdr struct { type Cmsghdr struct {
...@@ -271,11 +271,11 @@ type Utsname struct { ...@@ -271,11 +271,11 @@ type Utsname struct {
} }
type Ustat_t struct { type Ustat_t struct {
Tfree int64 Tfree int64
Tinode uint64 Tinode uint64
Fname [6]int8 Fname [6]int8
Fpack [6]int8 Fpack [6]int8
Pad_cgo_0 [4]byte _ [4]byte
} }
const ( const (
...@@ -295,21 +295,21 @@ const ( ...@@ -295,21 +295,21 @@ const (
) )
type IfMsghdr struct { type IfMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Data IfData Data IfData
} }
type IfData struct { type IfData struct {
Type uint8 Type uint8
Addrlen uint8 Addrlen uint8
Hdrlen uint8 Hdrlen uint8
Pad_cgo_0 [1]byte _ [1]byte
Mtu uint32 Mtu uint32
Metric uint32 Metric uint32
Baudrate uint32 Baudrate uint32
...@@ -328,30 +328,30 @@ type IfData struct { ...@@ -328,30 +328,30 @@ type IfData struct {
} }
type IfaMsghdr struct { type IfaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Metric int32 Metric int32
} }
type RtMsghdr struct { type RtMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Flags int32 Flags int32
Addrs int32 Addrs int32
Pid int32 Pid int32
Seq int32 Seq int32
Errno int32 Errno int32
Use int32 Use int32
Inits uint32 Inits uint32
Rmx RtMetrics Rmx RtMetrics
} }
type RtMetrics struct { type RtMetrics struct {
...@@ -388,9 +388,9 @@ type BpfStat struct { ...@@ -388,9 +388,9 @@ type BpfStat struct {
} }
type BpfProgram struct { type BpfProgram struct {
Len uint32 Len uint32
Pad_cgo_0 [4]byte _ [4]byte
Insns *BpfInsn Insns *BpfInsn
} }
type BpfInsn struct { type BpfInsn struct {
...@@ -406,30 +406,30 @@ type BpfTimeval struct { ...@@ -406,30 +406,30 @@ type BpfTimeval struct {
} }
type BpfHdr struct { type BpfHdr struct {
Tstamp BpfTimeval Tstamp BpfTimeval
Caplen uint32 Caplen uint32
Datalen uint32 Datalen uint32
Hdrlen uint16 Hdrlen uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type Termios struct { type Termios struct {
Iflag uint32 Iflag uint32
Oflag uint32 Oflag uint32
Cflag uint32 Cflag uint32
Lflag uint32 Lflag uint32
Cc [19]uint8 Cc [19]uint8
Pad_cgo_0 [1]byte _ [1]byte
} }
type Termio struct { type Termio struct {
Iflag uint16 Iflag uint16
Oflag uint16 Oflag uint16
Cflag uint16 Cflag uint16
Lflag uint16 Lflag uint16
Line int8 Line int8
Cc [8]uint8 Cc [8]uint8
Pad_cgo_0 [1]byte _ [1]byte
} }
type Winsize struct { type Winsize struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment