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/pim_version.h
  13 +++ b/pimd/pim_version.h
  14 @@ -25,6 +25,6 @@
  15
  16  #define PIMD_VERSION_STR "0.166"
  17
  18 -const char * const PIMD_VERSION;
  19 +extern const char * const PIMD_VERSION;
  20
  21  #endif /* PIM_VERSION_H */
  22 --- a/pimd/pimd.h
  23 +++ b/pimd/pimd.h
  24 @@ -68,39 +68,39 @@
  25  #define PIM_MASK_PIM_J_P             (1 << 12)
  26  #define PIM_MASK_STATIC              (1 << 13)
  27
  28 -const char *const PIM_ALL_SYSTEMS;
  29 -const char *const PIM_ALL_ROUTERS;
  30 -const char *const PIM_ALL_PIM_ROUTERS;
  31 -const char *const PIM_ALL_IGMP_ROUTERS;
  32 +extern const char *const PIM_ALL_SYSTEMS;
  33 +extern const char *const PIM_ALL_ROUTERS;
  34 +extern const char *const PIM_ALL_PIM_ROUTERS;
  35 +extern const char *const PIM_ALL_IGMP_ROUTERS;
  36
  37 -struct thread_master     *master;
  38 -uint32_t                  qpim_debugs;
  39 -int                       qpim_mroute_socket_fd;
  40 -int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
  41 -struct thread            *qpim_mroute_socket_reader;
  42 -int                       qpim_mroute_oif_highest_vif_index;
  43 -struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
  44 -struct in_addr            qpim_all_pim_routers_addr;
  45 -int                       qpim_t_periodic; /* Period between Join/Prune Messages */
  46 -struct list              *qpim_upstream_list; /* list of struct pim_upstream */
  47 -struct zclient           *qpim_zclient_update;
  48 -struct zclient           *qpim_zclient_lookup;
  49 -struct pim_assert_metric  qpim_infinite_assert_metric;
  50 -long                      qpim_rpf_cache_refresh_delay_msec;
  51 -struct thread            *qpim_rpf_cache_refresher;
  52 -int64_t                   qpim_rpf_cache_refresh_requests;
  53 -int64_t                   qpim_rpf_cache_refresh_events;
  54 -int64_t                   qpim_rpf_cache_refresh_last;
  55 -struct in_addr            qpim_inaddr_any;
  56 -struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
  57 -struct in_addr            qpim_ssmpingd_group_addr;
  58 -int64_t                   qpim_scan_oil_events;
  59 -int64_t                   qpim_scan_oil_last;
  60 -int64_t                   qpim_mroute_add_events;
  61 -int64_t                   qpim_mroute_add_last;
  62 -int64_t                   qpim_mroute_del_events;
  63 -int64_t                   qpim_mroute_del_last;
  64 -struct list              *qpim_static_route_list; /* list of routes added statically */
  65 +extern struct thread_master     *master;
  66 +extern uint32_t                  qpim_debugs;
  67 +extern int                       qpim_mroute_socket_fd;
  68 +extern int64_t                   qpim_mroute_socket_creation; /* timestamp of creation */
  69 +extern struct thread            *qpim_mroute_socket_reader;
  70 +extern int                       qpim_mroute_oif_highest_vif_index;
  71 +extern struct list              *qpim_channel_oil_list; /* list of struct channel_oil */
  72 +static struct in_addr            qpim_all_pim_routers_addr;
  73 +extern int                       qpim_t_periodic; /* Period between Join/Prune Messages */
  74 +extern struct list              *qpim_upstream_list; /* list of struct pim_upstream */
  75 +extern struct zclient           *qpim_zclient_update;
  76 +extern struct zclient           *qpim_zclient_lookup;
  77 +extern struct pim_assert_metric  qpim_infinite_assert_metric;
  78 +extern long                      qpim_rpf_cache_refresh_delay_msec;
  79 +extern struct thread            *qpim_rpf_cache_refresher;
  80 +extern int64_t                   qpim_rpf_cache_refresh_requests;
  81 +extern int64_t                   qpim_rpf_cache_refresh_events;
  82 +extern int64_t                   qpim_rpf_cache_refresh_last;
  83 +extern struct in_addr            qpim_inaddr_any;
  84 +extern struct list              *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */
  85 +extern struct in_addr            qpim_ssmpingd_group_addr;
  86 +extern int64_t                   qpim_scan_oil_events;
  87 +extern int64_t                   qpim_scan_oil_last;
  88 +extern int64_t                   qpim_mroute_add_events;
  89 +extern int64_t                   qpim_mroute_add_last;
  90 +extern int64_t                   qpim_mroute_del_events;
  91 +extern int64_t                   qpim_mroute_del_last;
  92 +extern struct list              *qpim_static_route_list; /* list of routes added statically */
  93
  94  #define PIM_JP_HOLDTIME (qpim_t_periodic * 7 / 2)
  95