Commit d4cedef3 authored by Tobias Klauser's avatar Tobias Klauser Committed by Tobias Klauser

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 <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 31355384
...@@ -1055,7 +1055,7 @@ const ( ...@@ -1055,7 +1055,7 @@ const (
) )
// netfilter nfnetlink // netfilter nfnetlink
type Nfgenmsg = C.struct_nfgenmsg type Nfgenmsg C.struct_nfgenmsg
const ( const (
NFNL_BATCH_UNSPEC = C.NFNL_BATCH_UNSPEC NFNL_BATCH_UNSPEC = C.NFNL_BATCH_UNSPEC
......
...@@ -1382,7 +1382,7 @@ const ( ...@@ -1382,7 +1382,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1402,7 +1402,7 @@ const ( ...@@ -1402,7 +1402,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1371,7 +1371,7 @@ const ( ...@@ -1371,7 +1371,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1381,7 +1381,7 @@ const ( ...@@ -1381,7 +1381,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1376,7 +1376,7 @@ const ( ...@@ -1376,7 +1376,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1383,7 +1383,7 @@ const ( ...@@ -1383,7 +1383,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1383,7 +1383,7 @@ const ( ...@@ -1383,7 +1383,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1376,7 +1376,7 @@ const ( ...@@ -1376,7 +1376,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1391,7 +1391,7 @@ const ( ...@@ -1391,7 +1391,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1391,7 +1391,7 @@ const ( ...@@ -1391,7 +1391,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
...@@ -1408,7 +1408,7 @@ const ( ...@@ -1408,7 +1408,7 @@ const (
NFPROTO_NUMPROTO = 0xd NFPROTO_NUMPROTO = 0xd
) )
type Nfgenmsg = struct { type Nfgenmsg struct {
Nfgen_family uint8 Nfgen_family uint8
Version uint8 Version uint8
Res_id uint16 Res_id uint16
......
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