quagga/patches/200-gcc10.patch

   1 --- a/lib/prefix.h
   2 +++ b/lib/prefix.h
   3 @@ -44,7 +44,7 @@
   4   */
   5  struct ethaddr {
   6      u_char octet[ETHER_ADDR_LEN];
   7 -} __packed;
   8 +} __attribute__((packed));
   9
  10
  11  /*
  12 --- a/pimd/pimd.h
  13 +++ b/pimd/pimd.h
  14 @@ -74,25 +74,25 @@ const char *const PIM_ALL_PIM_ROUTERS;
  15  const char *const PIM_ALL_IGMP_ROUTERS;
  16
  17  struct thread_master     *master;
  18 -uint32_t                  qpim_debugs;
  19 -int                       qpim_mroute_socket_fd;
  20 +extern uint32_t                  qpim_debugs;
  21 +extern int                       qpim_mroute_socket_fd;
  22  int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
  23  struct thread            *qpim_mroute_socket_reader;
  24 -int                       qpim_mroute_oif_highest_vif_index;
  25 -struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
  26 -struct in_addr            qpim_all_pim_routers_addr;
  27 +extern int                       qpim_mroute_oif_highest_vif_index;
  28 +extern struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
  29 +static struct in_addr            qpim_all_pim_routers_addr;
  30  int                       qpim_t_periodic; /* Period between Join/Prune Messages */
  31 -struct list              *qpim_upstream_list; /* list of struct pim_upstream */
  32 +extern struct list              *qpim_upstream_list; /* list of struct pim_upstream */
  33  struct zclient           *qpim_zclient_update;
  34  struct zclient           *qpim_zclient_lookup;
  35 -struct pim_assert_metric  qpim_infinite_assert_metric;
  36 +extern struct pim_assert_metric  qpim_infinite_assert_metric;
  37  long                      qpim_rpf_cache_refresh_delay_msec;
  38  struct thread            *qpim_rpf_cache_refresher;
  39 -int64_t                   qpim_rpf_cache_refresh_requests;
  40 -int64_t                   qpim_rpf_cache_refresh_events;
  41 -int64_t                   qpim_rpf_cache_refresh_last;
  42 -struct in_addr            qpim_inaddr_any;
  43 -struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
  44 +extern int64_t                   qpim_rpf_cache_refresh_requests;
  45 +extern int64_t                   qpim_rpf_cache_refresh_events;
  46 +extern int64_t                   qpim_rpf_cache_refresh_last;
  47 +extern struct in_addr            qpim_inaddr_any;
  48 +extern struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
  49  struct in_addr            qpim_ssmpingd_group_addr;
  50  int64_t                   qpim_scan_oil_events;
  51  int64_t                   qpim_scan_oil_last;
  52 @@ -100,7 +100,7 @@ int64_t                   qpim_mroute_add_events;
  53  int64_t                   qpim_mroute_add_last;
  54  int64_t                   qpim_mroute_del_events;
  55  int64_t                   qpim_mroute_del_last;
  56 -struct list              *qpim_static_route_list; /* list of routes added statically */
  57 +extern struct list              *qpim_static_route_list; /* list of routes added statically */
  58
  59  #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2)
  60