diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2008-02-26 09:16:09 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2008-02-26 09:16:09 +0000 |
| commit | dea04441fb51f74dc25f6ab4bd756b4159d961b6 (patch) | |
| tree | 95a4578d95f20dd0dc168d07a90ea9cf71d6047f | |
| parent | d38e8d63fdfc0aefb78d0a51ffdf06d8b47993fd (diff) | |
[c++] remove/rename some names in headers that clash with C++ reserved words
2008-01-30 Peter Szilagyi <sp615@hszk.bme.hu>
* lib/stream.h: Remove named 'new' parameter in prototype
for c++ header compatibility.
* ospfd/ospf_opaque.h: ditto
* ospfd/ospfd.h: Renamed struct export to _export for c++
header compatibility.
* ospf6d/ospf6_area.h: ditto
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/stream.h | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_area.h | 6 | ||||
| -rw-r--r-- | ospfd/ospf_opaque.h | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.h | 6 |
5 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +2008-01-30 Peter Szilagyi <sp615@hszk.bme.hu> + + * lib/stream.h: Remove named 'new' parameter in prototype + for c++ header compatibility. + * ospfd/ospf_opaque.h: ditto + * ospfd/ospfd.h: Renamed struct export to _export for c++ + header compatibility. + * ospf6d/ospf6_area.h: ditto + 2008-01-11 Ingo Flaschberger <if@xip.at> * configure.ac: Improve HAVE_BSD_LINK_DETECT test. diff --git a/lib/stream.h b/lib/stream.h index d2d2e401..715a083d 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -137,7 +137,7 @@ struct stream_fifo */ extern struct stream *stream_new (size_t); extern void stream_free (struct stream *); -extern struct stream * stream_copy (struct stream *new, struct stream *src); +extern struct stream * stream_copy (struct stream *, struct stream *src); extern struct stream *stream_dup (struct stream *); extern size_t stream_resize (struct stream *, size_t); extern size_t stream_get_getp (struct stream *); diff --git a/ospf6d/ospf6_area.h b/ospf6d/ospf6_area.h index dd33ac47..6bf7e0b5 100644 --- a/ospf6d/ospf6_area.h +++ b/ospf6d/ospf6_area.h @@ -67,9 +67,9 @@ struct ospf6_area { char *name; struct access_list *list; - } export; -#define EXPORT_NAME(A) (A)->export.name -#define EXPORT_LIST(A) (A)->export.list + } _export; +#define EXPORT_NAME(A) (A)->_export.name +#define EXPORT_LIST(A) (A)->_export.list /* Area acceptance list */ struct diff --git a/ospfd/ospf_opaque.h b/ospfd/ospf_opaque.h index fc8d6ff6..f49fe460 100644 --- a/ospfd/ospf_opaque.h +++ b/ospfd/ospf_opaque.h @@ -141,7 +141,7 @@ extern void ospf_opaque_lsa_dump (struct stream *s, u_int16_t length); extern void ospf_opaque_lsa_originate_schedule (struct ospf_interface *oi, int *init_delay); -extern struct ospf_lsa *ospf_opaque_lsa_install (struct ospf_lsa *new, +extern struct ospf_lsa *ospf_opaque_lsa_install (struct ospf_lsa *, int rt_recalc); extern void ospf_opaque_lsa_refresh (struct ospf_lsa *lsa); diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index 7a0ffcef..b6187111 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -397,9 +397,9 @@ struct ospf_area { char *name; struct access_list *list; - } export; -#define EXPORT_NAME(A) (A)->export.name -#define EXPORT_LIST(A) (A)->export.list + } _export; +#define EXPORT_NAME(A) (A)->_export.name +#define EXPORT_LIST(A) (A)->_export.list /* Area acceptance list. */ struct |