[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

diff --git a/ChangeLog b/ChangeLog
index c8078e2defef07c4246ea5d36a8c8c0bb459166c..ae97cf37c9b4bbbe3fec5622e9cc8cee95201ea5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d2d2e40112b1241c4bc397118cad5c244dc5a7de..715a083dccf779252ba4056f307be2a372fa9924 100644 (file)
--- 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 dd33ac4765a4371a72a4eb22917ee4bd8ef488e1..6bf7e0b5fc5e10f8103dd040fd3b5af15e120455 100644 (file)
--- 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 fc8d6ff676e40ede6749ca9af64e0f88cc720e00..f49fe4606405692bbe1f42c423f78f10fe65495d 100644 (file)
--- 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 7a0ffcef668523ef312e970b3565971826c0726c..b618711159403a89cb675e7f6fae05b7c2c125a1 100644 (file)
--- 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