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_proto.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_proto.h')
| -rw-r--r-- | ospf6d/ospf6_proto.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ospf6d/ospf6_proto.h b/ospf6d/ospf6_proto.h index 9fe821df..a8c1b1a0 100644 --- a/ospf6d/ospf6_proto.h +++ b/ospf6d/ospf6_proto.h @@ -112,11 +112,10 @@ do { \ OSPF6_PREFIX_SPACE ((op)->prefix_length)); \ } while (0) -void ospf6_prefix_apply_mask (struct ospf6_prefix *op); -void ospf6_prefix_options_printbuf (u_int8_t prefix_options, - char *buf, int size); -void ospf6_capability_printbuf (char capability, char *buf, int size); -void ospf6_options_printbuf (u_char *options, char *buf, int size); +extern void ospf6_prefix_apply_mask (struct ospf6_prefix *op); +extern void ospf6_prefix_options_printbuf (u_int8_t prefix_options, + char *buf, int size); +extern void ospf6_capability_printbuf (char capability, char *buf, int size); +extern void ospf6_options_printbuf (u_char *options, char *buf, int size); #endif /* OSPF6_PROTO_H */ - |