From: David Ahern <dsahern@gmail.com>
Date: Wed, 19 Dec 2018 20:02:17 +0000 (-0800)
Subject: Merge branch 'iproute2-master' into iproute2-next
X-Git-Tag: v5.0.0~36^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6065ddfaa787ce726a215be3c1d037471bbe2013;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
---

6065ddfaa787ce726a215be3c1d037471bbe2013
diff --cc include/json_print.h
index 25954070d,ee087c3e6..dbdc90e23
--- a/include/json_print.h
+++ b/include/json_print.h
@@@ -64,12 -64,11 +64,12 @@@ _PRINT_FUNC(null, const char*)
  _PRINT_FUNC(string, const char*);
  _PRINT_FUNC(uint, unsigned int);
  _PRINT_FUNC(u64, uint64_t);
 +_PRINT_FUNC(hhu, unsigned char);
  _PRINT_FUNC(hu, unsigned short);
  _PRINT_FUNC(hex, unsigned int);
- _PRINT_FUNC(0xhex, unsigned long long int);
- _PRINT_FUNC(luint, unsigned long int);
- _PRINT_FUNC(lluint, unsigned long long int);
+ _PRINT_FUNC(0xhex, unsigned long long);
+ _PRINT_FUNC(luint, unsigned long);
+ _PRINT_FUNC(lluint, unsigned long long);
  _PRINT_FUNC(float, double);
  #undef _PRINT_FUNC