Mercurial > ecos

changeset 217:3ef90475a347

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile error.
author gthomas
date Wed, 05 Jun 2002 16:37:52 +0000
parents da643977bd0a
children 6882949455d7
files packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/include/netinet/in.h
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,8 @@
+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.
--- a/packages/net/bsd_tcpip/current/include/netinet/in.h
+++ b/packages/net/bsd_tcpip/current/include/netinet/in.h
@@ -320,7 +320,11 @@ struct sockaddr_in {
  */
 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
 };
 
 /*