Browse Source

[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
Paul Jakma 14 years ago
parent
commit
dea04441fb
5 changed files with 17 additions and 8 deletions
  1. 9 0
      ChangeLog
  2. 1 1
      lib/stream.h
  3. 3 3
      ospf6d/ospf6_area.h
  4. 1 1
      ospfd/ospf_opaque.h
  5. 3 3
      ospfd/ospfd.h

+ 9 - 0
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.

+ 1 - 1
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 *);

+ 3 - 3
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

+ 1 - 1
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);
 

+ 3 - 3
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