Skip to content

S
sys
Commit 1e3c7779 authored by Tobias Klauser's avatar Tobias Klauser Committed by Tobias Klauser
Browse files
Options

unix: don't export padding fields on Darwin 

Re-run ./mkall.sh to avoid exporting Pad_cgo* fields on Darwin.

Updates golang/go#18632

Change-Id: Id9d264293d0b1f1c5581aff289c6e826d63e71ef
Reviewed-on: https://go-review.googlesource.com/102075
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarMatt Layher <mdlayher@gmail.com>
parent c488ab1d
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
unix/ztypes_darwin_386.go
View file @ 1e3c7779
......@@ -142,7 +142,7 @@ type Dirent struct {
Namlen uint16
Type uint8
Name [1024]int8
Pad_cgo_0 [3]byte
_ [3]byte
}
type RawSockaddrInet4 struct {
......@@ -301,7 +301,7 @@ type IfMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Data IfData
}
......@@ -344,7 +344,7 @@ type IfaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Metric int32
}
......@@ -355,7 +355,7 @@ type IfmaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type IfmaMsghdr2 struct {
......@@ -365,7 +365,7 @@ type IfmaMsghdr2 struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Refcount int32
}
......@@ -374,7 +374,7 @@ type RtMsghdr struct {
Version uint8
Type uint8
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Flags int32
Addrs int32
Pid int32
......@@ -434,7 +434,7 @@ type BpfHdr struct {
Caplen uint32
Datalen uint32
Hdrlen uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type Termios struct {
......
unix/ztypes_darwin_amd64.go
View file @ 1e3c7779
......@@ -28,7 +28,7 @@ type Timespec struct {
type Timeval struct {
Sec int64
Usec int32
Pad_cgo_0 [4]byte
_ [4]byte
}
type Timeval32 struct {
......@@ -70,7 +70,7 @@ type Stat_t struct {
Uid uint32
Gid uint32
Rdev int32
Pad_cgo_0 [4]byte
_ [4]byte
Atimespec Timespec
Mtimespec Timespec
Ctimespec Timespec
......@@ -122,7 +122,7 @@ type Fstore_t struct {
type Radvisory_t struct {
Offset int64
Count int32
Pad_cgo_0 [4]byte
_ [4]byte
}
type Fbootstraptransfer_t struct {
......@@ -133,8 +133,8 @@ type Fbootstraptransfer_t struct {
type Log2phys_t struct {
Flags uint32
Pad_cgo_0 [8]byte
Pad_cgo_1 [8]byte
_ [8]byte
_ [8]byte
}
type Fsid struct {
......@@ -148,7 +148,7 @@ type Dirent struct {
Namlen uint16
Type uint8
Name [1024]int8
Pad_cgo_0 [3]byte
_ [3]byte
}
type RawSockaddrInet4 struct {
......@@ -221,10 +221,10 @@ type IPv6Mreq struct {
type Msghdr struct {
Name *byte
Namelen uint32
Pad_cgo_0 [4]byte
_ [4]byte
Iov *Iovec
Iovlen int32
Pad_cgo_1 [4]byte
_ [4]byte
Control *byte
Controllen uint32
Flags int32
......@@ -309,7 +309,7 @@ type IfMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Data IfData
}
......@@ -352,7 +352,7 @@ type IfaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Metric int32
}
......@@ -363,7 +363,7 @@ type IfmaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type IfmaMsghdr2 struct {
......@@ -373,7 +373,7 @@ type IfmaMsghdr2 struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Refcount int32
}
......@@ -382,7 +382,7 @@ type RtMsghdr struct {
Version uint8
Type uint8
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Flags int32
Addrs int32
Pid int32
......@@ -427,7 +427,7 @@ type BpfStat struct {
type BpfProgram struct {
Len uint32
Pad_cgo_0 [4]byte
_ [4]byte
Insns *BpfInsn
}
......@@ -443,7 +443,7 @@ type BpfHdr struct {
Caplen uint32
Datalen uint32
Hdrlen uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type Termios struct {
......@@ -452,7 +452,7 @@ type Termios struct {
Cflag uint64
Lflag uint64
Cc [20]uint8
Pad_cgo_0 [4]byte
_ [4]byte
Ispeed uint64
Ospeed uint64
}
......
unix/ztypes_darwin_arm.go
View file @ 1e3c7779
......@@ -143,7 +143,7 @@ type Dirent struct {
Namlen uint16
Type uint8
Name [1024]int8
Pad_cgo_0 [3]byte
_ [3]byte
}
type RawSockaddrInet4 struct {
......@@ -302,7 +302,7 @@ type IfMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Data IfData
}
......@@ -345,7 +345,7 @@ type IfaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Metric int32
}
......@@ -356,7 +356,7 @@ type IfmaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type IfmaMsghdr2 struct {
......@@ -366,7 +366,7 @@ type IfmaMsghdr2 struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Refcount int32
}
......@@ -375,7 +375,7 @@ type RtMsghdr struct {
Version uint8
Type uint8
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Flags int32
Addrs int32
Pid int32
......@@ -435,7 +435,7 @@ type BpfHdr struct {
Caplen uint32
Datalen uint32
Hdrlen uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type Termios struct {
......
unix/ztypes_darwin_arm64.go
View file @ 1e3c7779
......@@ -28,7 +28,7 @@ type Timespec struct {
type Timeval struct {
Sec int64
Usec int32
Pad_cgo_0 [4]byte
_ [4]byte
}
type Timeval32 struct {
......@@ -70,7 +70,7 @@ type Stat_t struct {
Uid uint32
Gid uint32
Rdev int32
Pad_cgo_0 [4]byte
_ [4]byte
Atimespec Timespec
Mtimespec Timespec
Ctimespec Timespec
......@@ -122,7 +122,7 @@ type Fstore_t struct {
type Radvisory_t struct {
Offset int64
Count int32
Pad_cgo_0 [4]byte
_ [4]byte
}
type Fbootstraptransfer_t struct {
......@@ -133,8 +133,8 @@ type Fbootstraptransfer_t struct {
type Log2phys_t struct {
Flags uint32
Pad_cgo_0 [8]byte
Pad_cgo_1 [8]byte
_ [8]byte
_ [8]byte
}
type Fsid struct {
......@@ -148,7 +148,7 @@ type Dirent struct {
Namlen uint16
Type uint8
Name [1024]int8
Pad_cgo_0 [3]byte
_ [3]byte
}
type RawSockaddrInet4 struct {
......@@ -221,10 +221,10 @@ type IPv6Mreq struct {
type Msghdr struct {
Name *byte
Namelen uint32
Pad_cgo_0 [4]byte
_ [4]byte
Iov *Iovec
Iovlen int32
Pad_cgo_1 [4]byte
_ [4]byte
Control *byte
Controllen uint32
Flags int32
......@@ -309,7 +309,7 @@ type IfMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Data IfData
}
......@@ -352,7 +352,7 @@ type IfaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Metric int32
}
......@@ -363,7 +363,7 @@ type IfmaMsghdr struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type IfmaMsghdr2 struct {
......@@ -373,7 +373,7 @@ type IfmaMsghdr2 struct {
Addrs int32
Flags int32
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Refcount int32
}
......@@ -382,7 +382,7 @@ type RtMsghdr struct {
Version uint8
Type uint8
Index uint16
Pad_cgo_0 [2]byte
_ [2]byte
Flags int32
Addrs int32
Pid int32
......@@ -427,7 +427,7 @@ type BpfStat struct {
type BpfProgram struct {
Len uint32
Pad_cgo_0 [4]byte
_ [4]byte
Insns *BpfInsn
}
......@@ -443,7 +443,7 @@ type BpfHdr struct {
Caplen uint32
Datalen uint32
Hdrlen uint16
Pad_cgo_0 [2]byte
_ [2]byte
}
type Termios struct {
......@@ -452,7 +452,7 @@ type Termios struct {
Cflag uint64
Lflag uint64
Cc [20]uint8
Pad_cgo_0 [4]byte
_ [4]byte
Ispeed uint64
Ospeed uint64
}
......
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