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_top.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_top.h')
| -rw-r--r-- | ospf6d/ospf6_top.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospf6d/ospf6_top.h b/ospf6d/ospf6_top.h index eae20e6e..ba485f9e 100644 --- a/ospf6d/ospf6_top.h +++ b/ospf6d/ospf6_top.h @@ -68,9 +68,9 @@ struct ospf6 extern struct ospf6 *ospf6; /* prototypes */ -void ospf6_top_init (); +extern void ospf6_top_init (void); -void ospf6_maxage_remove (struct ospf6 *o); +extern void ospf6_maxage_remove (struct ospf6 *o); #endif /* OSPF6_TOP_H */ |