From dea04441fb51f74dc25f6ab4bd756b4159d961b6 Mon Sep 17 00:00:00 2001
From: Paul Jakma <paul.jakma@sun.com>
Date: Tue, 26 Feb 2008 09:16:09 +0000
Subject: [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
---
ospf6d/ospf6_area.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'ospf6d')
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
--
cgit v1.2.1