diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ospf6d/ospf6_zebra.h | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ospf6d/ospf6_zebra.h')
| -rw-r--r-- | ospf6d/ospf6_zebra.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ospf6d/ospf6_zebra.h b/ospf6d/ospf6_zebra.h index fb9877bf..24a4ae63 100644 --- a/ospf6d/ospf6_zebra.h +++ b/ospf6d/ospf6_zebra.h @@ -37,17 +37,15 @@ extern unsigned char conf_debug_ospf6_zebra; extern struct zclient *zclient; -void ospf6_zebra_route_update_add (struct ospf6_route *request); -void ospf6_zebra_route_update_remove (struct ospf6_route *request); +extern void ospf6_zebra_route_update_add (struct ospf6_route *request); +extern void ospf6_zebra_route_update_remove (struct ospf6_route *request); -void ospf6_zebra_redistribute (int); -void ospf6_zebra_no_redistribute (int); -#define ospf6_zebra_is_redistribute(type) \ - (zclient->redist[type]) -void ospf6_zebra_init (); +extern void ospf6_zebra_redistribute (int); +extern void ospf6_zebra_no_redistribute (int); +#define ospf6_zebra_is_redistribute(type) (zclient->redist[type]) +extern void ospf6_zebra_init (void); -int config_write_ospf6_debug_zebra (struct vty *vty); -void install_element_ospf6_debug_zebra (); +extern int config_write_ospf6_debug_zebra (struct vty *vty); +extern void install_element_ospf6_debug_zebra (void); #endif /*OSPF6_ZEBRA_H*/ - |