Net - fix compile error

[Gary Thomas <gthomas at redhat dot com>]

Index: net/bsd_tcpip/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- net/bsd_tcpip/current/ChangeLog	20 May 2002 22:25:00 -0000	1.1
+++ net/bsd_tcpip/current/ChangeLog	5 Jun 2002 16:37:21 -0000
@@ -1,5 +1,10 @@
+2002-06-05  Gary Thomas  <gary@chez-thomas.org>
+
+	* include/netinet/in.h: Rename 'ip_opts' field (using the same
+	name as the structure is illegal in C++).
+
 2002-05-14  Jesper Skov  <jskov@redhat.com>
 
 	* include/netinet6/in6.h: Fixed warnings.
 
 2002-04-22  Gary Thomas  <gthomas@redhat.com>
Index: net/bsd_tcpip/current/include/netinet/in.h
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/include/netinet/in.h,v
retrieving revision 1.1
diff -u -5 -p -r1.1 in.h
--- net/bsd_tcpip/current/include/netinet/in.h	20 May 2002 22:25:01 -0000	1.1
+++ net/bsd_tcpip/current/include/netinet/in.h	5 Jun 2002 16:37:22 -0000
@@ -318,11 +318,15 @@ struct sockaddr_in {
  * The ip_dst is used for the first-hop gateway when using a source route
  * (this gets put into the header proper).
  */
 struct ip_opts {
 	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
-	char	ip_opts[40];		/* actually variable in size */
+#if defined(__cplusplus)
+	int8_t		Ip_opts[40];	/* cannot have same name as class */
+#else
+	int8_t		ip_opts[40];	/* actually variable in size */
+#endif
 };
 
 /*
  * Options for use with [gs]etsockopt at the IP level.
  * First word of comment is data type; bool is stored in int.

Attachment: signature.asc
Description: This is a digitally signed message part