[src/netbsd-1-6]: src/sys/netinet Pull up revision 1.59 (requested by kleink ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e06426fa8a01
branches:  netbsd-1-6
changeset: 530214:e06426fa8a01
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 28 12:46:03 2003 +0000

description:
Pull up revision 1.59 (requested by kleink in ticket #1119):
C++ does not permit static a data member to have the same name as its
class, so in a C++ environment rename the ip_opts member to Ip_opts as
observed in several other implementations; from Jon Olsson in
PR toolchain/19880.

diffstat:

 sys/netinet/in.h |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r a9d4f1fdcc75 -r e06426fa8a01 sys/netinet/in.h
--- a/sys/netinet/in.h  Mon Apr 28 08:05:48 2003 +0000
+++ b/sys/netinet/in.h  Mon Apr 28 12:46:03 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.h,v 1.58 2002/05/13 13:34:32 kleink Exp $   */
+/*     $NetBSD: in.h,v 1.58.4.1 2003/04/28 12:46:03 tron Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -241,7 +241,11 @@
  */
 struct ip_opts {
        struct in_addr  ip_dst;         /* first hop, 0 w/o src rt */
+#if defined(__cplusplus)
+       __int8_t        Ip_opts[40];    /* actually variable in size */
+#else
        __int8_t        ip_opts[40];    /* actually variable in size */
+#endif
 };
 
 /*