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_area.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_area.h')
| -rw-r--r-- | ospf6d/ospf6_area.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h index 6bf7e0b5..c7c5ee35 100644 --- a/ospf6d/ospf6_area.h +++ b/ospf6d/ospf6_area.h @@ -112,19 +112,18 @@ struct ospf6_area #define IS_AREA_STUB(oa) (CHECK_FLAG ((oa)->flag, OSPF6_AREA_STUB)) /* prototypes */ -int ospf6_area_cmp (void *va, void *vb); +extern int ospf6_area_cmp (void *va, void *vb); -struct ospf6_area *ospf6_area_create (u_int32_t, struct ospf6 *); -void ospf6_area_delete (struct ospf6_area *); -struct ospf6_area *ospf6_area_lookup (u_int32_t, struct ospf6 *); +extern struct ospf6_area *ospf6_area_create (u_int32_t, struct ospf6 *); +extern void ospf6_area_delete (struct ospf6_area *); +extern struct ospf6_area *ospf6_area_lookup (u_int32_t, struct ospf6 *); -void ospf6_area_enable (struct ospf6_area *); -void ospf6_area_disable (struct ospf6_area *); +extern void ospf6_area_enable (struct ospf6_area *); +extern void ospf6_area_disable (struct ospf6_area *); -void ospf6_area_show (struct vty *, struct ospf6_area *); +extern void ospf6_area_show (struct vty *, struct ospf6_area *); -void ospf6_area_config_write (struct vty *vty); -void ospf6_area_init (); +extern void ospf6_area_config_write (struct vty *vty); +extern void ospf6_area_init (void); #endif /* OSPF_AREA_H */ - |