summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-01-01 11:15:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-01-01 11:15:04 +0000
commit1d3f7ed4ffdcf382cc9a83096e77cae57c9cfec4 (patch)
tree6a30ec1855861cebc6691d6db05fe0cc28f26ec8 /sys/netinet
parent518f90001f0b010422520875ebebc539989e21b5 (diff)
mirror OSF1 solution for ip_opts[] within struct called ip_opts; dm@, pr#681
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 2e5dbd87acb..9ff83f1cc05 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: in.h,v 1.13 1998/05/18 21:10:26 provos Exp $ */
+/* $OpenBSD: in.h,v 1.14 1999/01/01 11:15:03 deraadt Exp $ */
/* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */
/*
@@ -209,7 +209,11 @@ struct sockaddr_in {
*/
struct ip_opts {
struct in_addr ip_dst; /* first hop, 0 w/o src rt */
+#if defined(__cplusplus)
+ char Ip_opts[40]; /* cannot have same name as class */
+#else
int8_t ip_opts[40]; /* actually variable in size */
+#endif
};
/*