svn commit: r238875 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Jul 28 22:42:52 2012
New Revision: 238875
URL: http://svn.freebsd.org/changeset/base/238875

Log:
  MFC r238790:
  
  Fix the sctp_sockstore union such that userland programs don't depend
  on INET and/or INET6 to be defined and in-tune with how the kernel
  was compiled.
  
  Approved by:	re (kib)

Modified:
  stable/9/sys/netinet/sctp_uio.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_uio.h
==============================================================================
--- stable/9/sys/netinet/sctp_uio.h	Sat Jul 28 21:59:12 2012	(r238874)
+++ stable/9/sys/netinet/sctp_uio.h	Sat Jul 28 22:42:52 2012	(r238875)
@@ -1124,12 +1124,8 @@ struct sctpstat {
 #define SCTP_STAT_DECR_GAUGE32(_x) SCTP_STAT_DECR(_x)
 
 union sctp_sockstore {
-#if defined(INET)
 	struct sockaddr_in sin;
-#endif
-#if defined(INET6)
 	struct sockaddr_in6 sin6;
-#endif
 	struct sockaddr sa;
 };