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

[Randall Stewart]

Author: rrs
Date: Sat Apr 17 03:40:48 2010
New Revision: 206724
URL: http://svn.freebsd.org/changeset/base/206724

Log:
  MFC 202516
  
  This gets rid of some stray #ifdef APPLE that drifted in
  some how.

Modified:
  stable/8/sys/netinet/sctp_constants.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/sctp_constants.h
==============================================================================
--- stable/8/sys/netinet/sctp_constants.h	Sat Apr 17 03:38:26 2010	(r206723)
+++ stable/8/sys/netinet/sctp_constants.h	Sat Apr 17 03:40:48 2010	(r206724)
@@ -276,28 +276,16 @@ __FBSDID("$FreeBSD$");
 #define SCTP_SCALE_FOR_ADDR	2
 
 /* default AUTO_ASCONF mode enable(1)/disable(0) value (sysctl) */
-#if defined (__APPLE__) && !defined(SCTP_APPLE_AUTO_ASCONF)
-#define SCTP_DEFAULT_AUTO_ASCONF        0
-#else
 #define SCTP_DEFAULT_AUTO_ASCONF	1
-#endif
 
 /* default MULTIPLE_ASCONF mode enable(1)/disable(0) value (sysctl) */
 #define SCTP_DEFAULT_MULTIPLE_ASCONFS	0
 
 /* default MOBILITY_BASE mode enable(1)/disable(0) value (sysctl) */
-#if defined (__APPLE__) && !defined(SCTP_APPLE_MOBILITY_BASE)
-#define SCTP_DEFAULT_MOBILITY_BASE      0
-#else
 #define SCTP_DEFAULT_MOBILITY_BASE	0
-#endif
 
 /* default MOBILITY_FASTHANDOFF mode enable(1)/disable(0) value (sysctl) */
-#if defined (__APPLE__) && !defined(SCTP_APPLE_MOBILITY_FASTHANDOFF)
 #define SCTP_DEFAULT_MOBILITY_FASTHANDOFF	0
-#else
-#define SCTP_DEFAULT_MOBILITY_FASTHANDOFF	0
-#endif
 
 /*
  * Theshold for rwnd updates, we have to read (sb_hiwat >>