--- embedaddon/quagga/bgpd/bgp_main.c	2012/10/09 09:22:28	1.1.1.2
+++ embedaddon/quagga/bgpd/bgp_main.c	2013/07/21 23:54:37	1.1.1.3
@@ -135,7 +135,7 @@ struct zebra_privs_t bgpd_privs =
   .vty_group = VTY_GROUP,
 #endif
   .caps_p = _caps_p,
-  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),
+  .cap_num_p = array_size(_caps_p),
   .cap_num_i = 0,
 };
 
@@ -422,7 +422,7 @@ main (int argc, char **argv)
 
   /* Initializations. */
   srand (time (NULL));
-  signal_init (master, Q_SIGC(bgp_signals), bgp_signals);
+  signal_init (master, array_size(bgp_signals), bgp_signals);
   zprivs_init (&bgpd_privs);
   cmd_init (1);
   vty_init (master);