Hello.
In C++ the extern "C" { } construct shouldn't have a trailing ;.
The attached patch cleans up all the headers in include. It also makes it
possible to compile using g++-3.4 and higher.
/MF
Index: include/net-snmp/types.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/types.h,v
retrieving revision 5.10
diff -u -r5.10 types.h
--- include/net-snmp/types.h 1 Sep 2004 15:25:46 -0000 5.10
+++ include/net-snmp/types.h 9 Sep 2004 16:30:45 -0000
@@ -181,7 +181,7 @@
} * netsnmp_ref_size_t;
#ifdef __cplusplus
-};
+}
#endif
#endif /* NET_SNMP_TYPES_H */
Index: include/net-snmp/agent/agent_handler.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/agent_handler.h,v
retrieving revision 5.13
diff -u -r5.13 agent_handler.h
--- include/net-snmp/agent/agent_handler.h 31 Aug 2004 07:37:34 -0000 5.13
+++ include/net-snmp/agent/agent_handler.h 9 Sep 2004 16:30:46 -0000
@@ -259,7 +259,7 @@
const char *);
#ifdef __cplusplus
-};
+}
#endif
#endif /* AGENT_HANDLER_H */
Index: include/net-snmp/agent/agent_registry.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/agent_registry.h,v
retrieving revision 5.6
diff -u -r5.6 agent_registry.h
--- include/net-snmp/agent/agent_registry.h 31 Jul 2004 00:30:02 -0000 5.6
+++ include/net-snmp/agent/agent_registry.h 9 Sep 2004 16:30:46 -0000
@@ -198,7 +198,7 @@
int);
#ifdef __cplusplus
-};
+}
#endif
#endif /* AGENT_REGISTRY_H */
Index: include/net-snmp/agent/baby_steps.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/baby_steps.h,v
retrieving revision 1.5
diff -u -r1.5 baby_steps.h
--- include/net-snmp/agent/baby_steps.h 8 Sep 2004 15:39:00 -0000 1.5
+++ include/net-snmp/agent/baby_steps.h 9 Sep 2004 16:30:46 -0000
@@ -102,6 +102,6 @@
#ifdef __cplusplus
-};
+}
#endif
#endif /* baby_steps */
Index: include/net-snmp/agent/cache_handler.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/cache_handler.h,v
retrieving revision 1.16
diff -u -r1.16 cache_handler.h
--- include/net-snmp/agent/cache_handler.h 31 Aug 2004 07:36:25 -0000 1.16
+++ include/net-snmp/agent/cache_handler.h 9 Sep 2004 16:30:46 -0000
@@ -106,6 +106,6 @@
#ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_CACHE_HANDLER_H */
Index: include/net-snmp/agent/instance.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/instance.h,v
retrieving revision 5.3
diff -u -r5.3 instance.h
--- include/net-snmp/agent/instance.h 31 Jul 2004 00:24:01 -0000 5.3
+++ include/net-snmp/agent/instance.h 9 Sep 2004 16:30:46 -0000
@@ -142,7 +142,7 @@
Netsnmp_Node_Handler netsnmp_instance_counter32_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_INSTANCE_H */
Index: include/net-snmp/agent/row_merge.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/row_merge.h,v
retrieving revision 1.1
diff -u -r1.1 row_merge.h
--- include/net-snmp/agent/row_merge.h 28 May 2003 12:14:32 -0000 1.1
+++ include/net-snmp/agent/row_merge.h 9 Sep 2004 16:30:46 -0000
@@ -18,6 +18,6 @@
Netsnmp_Node_Handler netsnmp_row_merge_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif
Index: include/net-snmp/agent/scalar.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/scalar.h,v
retrieving revision 1.1
diff -u -r1.1 scalar.h
--- include/net-snmp/agent/scalar.h 22 Jul 2002 08:43:24 -0000 1.1
+++ include/net-snmp/agent/scalar.h 9 Sep 2004 16:30:46 -0000
@@ -30,7 +30,7 @@
Netsnmp_Node_Handler netsnmp_scalar_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_SCALAR_H */
Index: include/net-snmp/agent/scalar_group.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/scalar_group.h,v
retrieving revision 1.1
diff -u -r1.1 scalar_group.h
--- include/net-snmp/agent/scalar_group.h 4 Jun 2003 12:50:51 -0000 1.1
+++ include/net-snmp/agent/scalar_group.h 9 Sep 2004 16:30:46 -0000
@@ -30,7 +30,7 @@
Netsnmp_Node_Handler netsnmp_scalar_group_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_SCALAR_GROUP_H */
Index: include/net-snmp/agent/serialize.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/serialize.h,v
retrieving revision 5.1
diff -u -r5.1 serialize.h
--- include/net-snmp/agent/serialize.h 12 Jun 2002 09:15:45 -0000 5.1
+++ include/net-snmp/agent/serialize.h 9 Sep 2004 16:30:46 -0000
@@ -19,6 +19,6 @@
Netsnmp_Node_Handler netsnmp_serialize_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif
Index: include/net-snmp/agent/table.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table.h,v
retrieving revision 5.7
diff -u -r5.7 table.h
--- include/net-snmp/agent/table.h 7 Mar 2004 03:23:03 -0000 5.7
+++ include/net-snmp/agent/table.h 9 Sep 2004 16:30:46 -0000
@@ -188,7 +188,7 @@
netsnmp_mib_handler *netsnmp_sparse_table_handler_get(void);
#ifdef __cplusplus
-};
+}
#endif
#endif /* _TABLE_HANDLER_H_ */
Index: include/net-snmp/agent/table_array.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table_array.h,v
retrieving revision 5.10
diff -u -r5.10 table_array.h
--- include/net-snmp/agent/table_array.h 14 Jan 2004 04:09:14 -0000 5.10
+++ include/net-snmp/agent/table_array.h 9 Sep 2004 16:30:46 -0000
@@ -146,7 +146,7 @@
long *rs_new, long *rs_old);
#ifdef __cplusplus
-};
+}
#endif
#endif /* _TABLE_ARRAY_HANDLER_H_ */
Index: include/net-snmp/agent/table_container.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table_container.h,v
retrieving revision 1.5
diff -u -r1.5 table_container.h
--- include/net-snmp/agent/table_container.h 28 Aug 2004 19:17:45 -0000 1.5
+++ include/net-snmp/agent/table_container.h 9 Sep 2004 16:30:46 -0000
@@ -80,7 +80,7 @@
netsnmp_container *container,
char key_type );
#ifdef __cplusplus
-};
+}
#endif
#endif /* _TABLE_CONTAINER_HANDLER_H_ */
Index: include/net-snmp/agent/table_data.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table_data.h,v
retrieving revision 5.5
diff -u -r5.5 table_data.h
--- include/net-snmp/agent/table_data.h 23 Apr 2004 15:15:41 -0000 5.5
+++ include/net-snmp/agent/table_data.h 9 Sep 2004 16:30:46 -0000
@@ -107,7 +107,7 @@
Netsnmp_Node_Handler netsnmp_table_data_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /* _TABLE_DATA_HANDLER_H_ */
Index: include/net-snmp/agent/table_dataset.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table_dataset.h,v
retrieving revision 5.6
diff -u -r5.6 table_dataset.h
--- include/net-snmp/agent/table_dataset.h 7 Apr 2004 10:23:51 -0000 5.6
+++ include/net-snmp/agent/table_dataset.h 9 Sep 2004 16:30:46 -0000
@@ -160,7 +160,7 @@
#endif
#ifdef __cplusplus
-};
+}
#endif
#define netsnmp_table_row_add_column(row, type, value, value_len)
snmp_varlist_add_variable(&row->indexes, NULL, 0, type, (u_char *) value, value_len)
Index: include/net-snmp/agent/table_iterator.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/table_iterator.h,v
retrieving revision 5.4
diff -u -r5.4 table_iterator.h
--- include/net-snmp/agent/table_iterator.h 16 Feb 2004 20:46:24 -0000 5.4
+++ include/net-snmp/agent/table_iterator.h 9 Sep 2004 16:30:46 -0000
@@ -131,7 +131,7 @@
Netsnmp_Node_Handler netsnmp_table_iterator_helper_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /* _TABLE_ITERATOR_HANDLER_H_ */
Index: include/net-snmp/agent/watcher.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/agent/watcher.h,v
retrieving revision 1.5
diff -u -r1.5 watcher.h
--- include/net-snmp/agent/watcher.h 19 Mar 2004 16:29:01 -0000 1.5
+++ include/net-snmp/agent/watcher.h 9 Sep 2004 16:30:46 -0000
@@ -41,7 +41,7 @@
Netsnmp_Node_Handler netsnmp_watched_spinlock_handler;
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_WATCHER_H */
Index: include/net-snmp/data_access/arp.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/arp.h,v
retrieving revision 1.1
diff -u -r1.1 arp.h
--- include/net-snmp/data_access/arp.h 15 Apr 2004 21:52:21 -0000 1.1
+++ include/net-snmp/data_access/arp.h 9 Sep 2004 16:30:46 -0000
@@ -127,7 +127,7 @@
/**---------------------------------------------------------------------*/
#ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_ARP_H */
Index: include/net-snmp/data_access/interface.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/interface.h,v
retrieving revision 1.12
diff -u -r1.12 interface.h
--- include/net-snmp/data_access/interface.h 25 Aug 2004 19:35:03 -0000 1.12
+++ include/net-snmp/data_access/interface.h 9 Sep 2004 16:30:46 -0000
@@ -212,7 +212,7 @@
/**---------------------------------------------------------------------*/
#ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_INTERFACE_H */
Index: include/net-snmp/data_access/ipaddress.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/ipaddress.h,v
retrieving revision 1.3
diff -u -r1.3 ipaddress.h
--- include/net-snmp/data_access/ipaddress.h 7 Jul 2004 04:12:10 -0000 1.3
+++ include/net-snmp/data_access/ipaddress.h 9 Sep 2004 16:30:46 -0000
@@ -104,7 +104,7 @@
/**---------------------------------------------------------------------*/
# ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_IPADDRESS_H */
Index: include/net-snmp/data_access/ipstats.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/ipstats.h,v
retrieving revision 1.1
diff -u -r1.1 ipstats.h
--- include/net-snmp/data_access/ipstats.h 10 Jul 2004 18:05:46 -0000 1.1
+++ include/net-snmp/data_access/ipstats.h 9 Sep 2004 16:30:46 -0000
@@ -54,7 +54,7 @@
# ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_IPSTATS_H */
Index: include/net-snmp/data_access/route.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/route.h,v
retrieving revision 1.7
diff -u -r1.7 route.h
--- include/net-snmp/data_access/route.h 28 Aug 2004 06:15:35 -0000 1.7
+++ include/net-snmp/data_access/route.h 9 Sep 2004 16:30:47 -0000
@@ -118,7 +118,7 @@
/**---------------------------------------------------------------------*/
# ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_ROUTE_H */
Index: include/net-snmp/data_access/systemstats.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/data_access/systemstats.h,v
retrieving revision 1.1
diff -u -r1.1 systemstats.h
--- include/net-snmp/data_access/systemstats.h 10 Jul 2004 18:05:46 -0000 1.1
+++ include/net-snmp/data_access/systemstats.h 9 Sep 2004 16:30:47 -0000
@@ -83,7 +83,7 @@
/**---------------------------------------------------------------------*/
# ifdef __cplusplus
-};
+}
#endif
#endif /* NETSNMP_ACCESS_SYSTEMSTATS_H */
Index: include/net-snmp/library/container.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/container.h,v
retrieving revision 1.24
diff -u -r1.24 container.h
--- include/net-snmp/library/container.h 28 Aug 2004 19:17:46 -0000 1.24
+++ include/net-snmp/library/container.h 9 Sep 2004 16:30:47 -0000
@@ -491,7 +491,7 @@
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_CONTAINER_H */
Index: include/net-snmp/library/container_iterator.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/container_iterator.h,v
retrieving revision 1.2
diff -u -r1.2 container_iterator.h
--- include/net-snmp/library/container_iterator.h 14 Oct 2003 16:35:01 -0000
1.2
+++ include/net-snmp/library/container_iterator.h 9 Sep 2004 16:30:47 -0000
@@ -55,7 +55,7 @@
Netsnmp_Iterator_Op * get_size);
#ifdef __cplusplus
-};
+}
#endif
#endif /* _CONTAINER_ITERATOR_HANDLER_H_ */
Index: include/net-snmp/library/container_list_ssll.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/container_list_ssll.h,v
retrieving revision 1.2
diff -u -r1.2 container_list_ssll.h
--- include/net-snmp/library/container_list_ssll.h 7 Jul 2004 14:02:21 -0000
1.2
+++ include/net-snmp/library/container_list_ssll.h 9 Sep 2004 16:30:47 -0000
@@ -20,7 +20,7 @@
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_CONTAINER_SSLL_H */
Index: include/net-snmp/library/container_null.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/container_null.h,v
retrieving revision 1.1
diff -u -r1.1 container_null.h
--- include/net-snmp/library/container_null.h 4 Jul 2003 03:54:22 -0000 1.1
+++ include/net-snmp/library/container_null.h 9 Sep 2004 16:30:47 -0000
@@ -14,7 +14,7 @@
#ifdef __cplusplus
-};
+}
#endif
#endif /** NETSNMP_CONTAINER_NULL_H */
Index: include/net-snmp/library/factory.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/factory.h,v
retrieving revision 1.1
diff -u -r1.1 factory.h
--- include/net-snmp/library/factory.h 16 Jul 2002 16:29:39 -0000 1.1
+++ include/net-snmp/library/factory.h 9 Sep 2004 16:30:47 -0000
@@ -65,7 +65,7 @@
};
#ifdef __cplusplus
-};
+}
#endif
