From d4cedef3467ee719ea35470faeefbc6d0fa18e4b Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 25 May 2018 13:52:06 +0200 Subject: [PATCH] unix: make Nfgenmsg a type definition CL 114518 introduced Nfgenmsg as a type alias which breaks the build on Go <= 1.9. Fix it by making Nfgenmsg a type like all others in x/sys/unix Updates golang/go#25561 Fixes golang/go#25563 Change-Id: I9950be857e34e7e3ca79c71fced9663a0cac9b63 Reviewed-on: https://go-review.googlesource.com/114596 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- unix/linux/types.go | 2 +- unix/ztypes_linux_386.go | 2 +- unix/ztypes_linux_amd64.go | 2 +- unix/ztypes_linux_arm.go | 2 +- unix/ztypes_linux_arm64.go | 2 +- unix/ztypes_linux_mips.go | 2 +- unix/ztypes_linux_mips64.go | 2 +- unix/ztypes_linux_mips64le.go | 2 +- unix/ztypes_linux_mipsle.go | 2 +- unix/ztypes_linux_ppc64.go | 2 +- unix/ztypes_linux_ppc64le.go | 2 +- unix/ztypes_linux_s390x.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/unix/linux/types.go b/unix/linux/types.go index f07a3b94..400547d8 100644 --- a/unix/linux/types.go +++ b/unix/linux/types.go @@ -1055,7 +1055,7 @@ const ( ) // netfilter nfnetlink -type Nfgenmsg = C.struct_nfgenmsg +type Nfgenmsg C.struct_nfgenmsg const ( NFNL_BATCH_UNSPEC = C.NFNL_BATCH_UNSPEC diff --git a/unix/ztypes_linux_386.go b/unix/ztypes_linux_386.go index f11f1659..40474620 100644 --- a/unix/ztypes_linux_386.go +++ b/unix/ztypes_linux_386.go @@ -1382,7 +1382,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_amd64.go b/unix/ztypes_linux_amd64.go index 2cd848a6..2ab0cb9e 100644 --- a/unix/ztypes_linux_amd64.go +++ b/unix/ztypes_linux_amd64.go @@ -1402,7 +1402,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_arm.go b/unix/ztypes_linux_arm.go index 5c400e6c..18d577b9 100644 --- a/unix/ztypes_linux_arm.go +++ b/unix/ztypes_linux_arm.go @@ -1371,7 +1371,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_arm64.go b/unix/ztypes_linux_arm64.go index 9446943b..6ea80563 100644 --- a/unix/ztypes_linux_arm64.go +++ b/unix/ztypes_linux_arm64.go @@ -1381,7 +1381,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_mips.go b/unix/ztypes_linux_mips.go index 12228544..e0a39322 100644 --- a/unix/ztypes_linux_mips.go +++ b/unix/ztypes_linux_mips.go @@ -1376,7 +1376,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_mips64.go b/unix/ztypes_linux_mips64.go index 89e2b726..838135e2 100644 --- a/unix/ztypes_linux_mips64.go +++ b/unix/ztypes_linux_mips64.go @@ -1383,7 +1383,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_mips64le.go b/unix/ztypes_linux_mips64le.go index aea730b7..a9d0131f 100644 --- a/unix/ztypes_linux_mips64le.go +++ b/unix/ztypes_linux_mips64le.go @@ -1383,7 +1383,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_mipsle.go b/unix/ztypes_linux_mipsle.go index a59aef9f..4f6f1455 100644 --- a/unix/ztypes_linux_mipsle.go +++ b/unix/ztypes_linux_mipsle.go @@ -1376,7 +1376,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_ppc64.go b/unix/ztypes_linux_ppc64.go index dc2b41c2..9ddd4701 100644 --- a/unix/ztypes_linux_ppc64.go +++ b/unix/ztypes_linux_ppc64.go @@ -1391,7 +1391,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_ppc64le.go b/unix/ztypes_linux_ppc64le.go index 3fc7fb26..3a5cc696 100644 --- a/unix/ztypes_linux_ppc64le.go +++ b/unix/ztypes_linux_ppc64le.go @@ -1391,7 +1391,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16 diff --git a/unix/ztypes_linux_s390x.go b/unix/ztypes_linux_s390x.go index 16817182..032a71bb 100644 --- a/unix/ztypes_linux_s390x.go +++ b/unix/ztypes_linux_s390x.go @@ -1408,7 +1408,7 @@ const ( NFPROTO_NUMPROTO = 0xd ) -type Nfgenmsg = struct { +type Nfgenmsg struct { Nfgen_family uint8 Version uint8 Res_id uint16