From: verrens <verrens@yandex.ru>
Date: Sat, 3 Aug 2024 16:29:29 +0000 (+0300)
Subject: Merge branch 'master' into compact-layout
X-Git-Tag: v0.96~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F511%2Fhead;p=thirdparty%2Fmtr.git

Merge branch 'master' into compact-layout
---

748de4b5468cb67e8ab3ac1b113af3e1b98b786b
diff --cc ui/mtr.h
index 252d954,0adff62..7b4482b
--- a/ui/mtr.h
+++ b/ui/mtr.h
@@@ -116,7 -117,13 +117,13 @@@ struct mtr_ctl 
       ForceMaxPing:1,
          use_dns:1,
          show_ips:1,
 -        enablempls:1, dns:1, reportwide:1, Interactive:1, DisplayMode:5;
 +        enablempls:1, dns:1, reportwide:1, Interactive:1, DisplayMode:5, CompactLayout:1;
+ #ifdef HAVE_IPINFO
+ #ifdef ENABLE_IPV6
+     char *ipinfo_provider6;
+ #endif
+     char *ipinfo_provider4;
+ #endif
  };
  
  /* dynamic field drawing */