summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_spf.h
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-13 12:12:33 -0700
commitd3e384e4f00aa90db4310f82f3cbe6528e256334 (patch)
tree716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ospf6d/ospf6_spf.h
parentd0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff)
parent41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff)
downloadquagga-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_spf.h')
-rw-r--r--ospf6d/ospf6_spf.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/ospf6d/ospf6_spf.h b/ospf6d/ospf6_spf.h
index 728eec51..c7069c25 100644
--- a/ospf6d/ospf6_spf.h
+++ b/ospf6d/ospf6_spf.h
@@ -77,18 +77,18 @@ struct ospf6_vertex
#define VERTEX_IS_TYPE(t, v) \
((v)->type == OSPF6_VERTEX_TYPE_ ## t ? 1 : 0)
-void ospf6_spf_table_finish (struct ospf6_route_table *result_table);
-void ospf6_spf_calculation (u_int32_t router_id,
- struct ospf6_route_table *result_table,
- struct ospf6_area *oa);
-void ospf6_spf_schedule (struct ospf6_area *oa);
-
-void ospf6_spf_display_subtree (struct vty *vty, const char *prefix,
- int rest, struct ospf6_vertex *v);
-
-int config_write_ospf6_debug_spf (struct vty *vty);
-void install_element_ospf6_debug_spf ();
-void ospf6_spf_init ();
+extern void ospf6_spf_table_finish (struct ospf6_route_table *result_table);
+extern void ospf6_spf_calculation (u_int32_t router_id,
+ struct ospf6_route_table *result_table,
+ struct ospf6_area *oa);
+extern void ospf6_spf_schedule (struct ospf6_area *oa);
+
+extern void ospf6_spf_display_subtree (struct vty *vty, const char *prefix,
+ int rest, struct ospf6_vertex *v);
+
+extern int config_write_ospf6_debug_spf (struct vty *vty);
+extern void install_element_ospf6_debug_spf (void);
+extern void ospf6_spf_init (void);
#endif /* OSPF6_SPF_H */