From 474c8a0757edd6f650220dcba31b69dcb83c4b73 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 18 Dec 2015 01:15:37 +0000 Subject: [PATCH] syscall: Add definition for NLA_HDRLEN This change updates mksysinfo.sh so it correctly includes the define NLA_HDRLEN in the syscall package. Fixes golang/go/#13629 Reviewed-on: https://go-review.googlesource.com/17893 From-SVN: r231796 --- libgo/mksysinfo.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index 662619f2076..9062c2c9236 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -267,6 +267,9 @@ enum { #ifdef TUNGETFILTER TUNGETFILTER_val = TUNGETFILTER, #endif +#ifdef NLA_HDRLEN + NLA_HDRLEN_val = NLA_HDRLEN, +#endif }; EOF @@ -1075,8 +1078,6 @@ if ! grep '^const TUNGETFILTER' ${OUT} >/dev/null 2>&1; then fi fi - - # The ioctl flags for terminal control grep '^const _TC[GS]ET' gen-sysinfo.go | grep -v _val | \ sed -e 's/^\(const \)_\(TC[GS]ET[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} @@ -1422,9 +1423,15 @@ grep '^type _rtnexthop ' gen-sysinfo.go | \ # The GNU/Linux netlink flags. grep '^const _NETLINK_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(NETLINK_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} -grep '^const _NLA_' gen-sysinfo.go | \ +grep '^const _NLA_' gen-sysinfo.go | grep -v '_val =' | \ sed -e 's/^\(const \)_\(NLA_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +if ! grep '^const NLA_HDRLEN' ${OUT} >/dev/null 2>&1; then + if grep '^const _NLA_HDRLEN_val' ${OUT} >/dev/null 2>&1; then + echo 'const NLA_HDRLEN = _NLA_HDRLEN_val' >> ${OUT} + fi +fi + # The GNU/Linux packet socket flags. grep '^const _PACKET_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(PACKET_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} -- 2.30.2