svn commit: r247980 - stable/8/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu Mar  7 23:53:11 2013
New Revision: 247980
URL: http://svnweb.freebsd.org/changeset/base/247980

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.

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

Modified: stable/8/sys/netinet/sctp_uio.h
==============================================================================
--- stable/8/sys/netinet/sctp_uio.h	Thu Mar  7 23:52:15 2013	(r247979)
+++ stable/8/sys/netinet/sctp_uio.h	Thu Mar  7 23:53:11 2013	(r247980)
@@ -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;
 };