Update due to Newlib 2017-06-07 changes

The following files are now provided by Newlib:

  * arpa/inet.h
  * net/if.h
  * netinet/in.h
  * netinet/tcp.h
  * sys/socket.h
  * sys/uio.h
  * sys/un.h

The <sys/param.h> and <sys/cpuset.h> are now compatible enough to be
used directly.

Update #2833.

builder.py

@@ -231,9 +231,6 @@ def mapCPUDependentPath(path):
 
 def fixIncludes(data):
     data = re.sub('#include <sys/lock.h>',     '#include <rtems/bsd/sys/lock.h>', data)
-    data = re.sub('#include <sys/cpuset.h>',   '#include <rtems/bsd/sys/cpuset.h>', data)
-    data = re.sub('#include <sys/errno.h>',    '#include <rtems/bsd/sys/errno.h>', data)
-    data = re.sub('#include <sys/param.h>',    '#include <rtems/bsd/sys/param.h>', data)
     data = re.sub('#include <sys/resource.h>', '#include <rtems/bsd/sys/resource.h>', data)
     data = re.sub('#include <sys/unistd.h>',   '#include <rtems/bsd/sys/unistd.h>', data)
     return data

freebsd/bin/hostname/hostname.c

@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <err.h>
 #include <stdio.h>

freebsd/contrib/libpcap/gencode.c

@@ -57,7 +57,7 @@ static const char rcsid[] _U_ =
 #ifndef WIN32
 
 #ifdef __NetBSD__
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #endif
 
 #include <netinet/in.h>

freebsd/contrib/libpcap/inet.c

@@ -47,7 +47,7 @@ static const char rcsid[] _U_ =
 #include <pcap-stdinc.h>
 #else /* WIN32 */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #ifndef MSDOS
 #include <sys/file.h>
 #endif

freebsd/contrib/libpcap/nametoaddr.c

@@ -45,7 +45,7 @@ static const char rcsid[] _U_ =
 
 #else /* WIN32 */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/types.h>				/* concession to AIX */
 #include <sys/socket.h>
 #include <sys/time.h>

freebsd/contrib/libpcap/pcap-bpf.c

@@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
 #include "config.h"
 #endif
 
-#include <rtems/bsd/sys/param.h>			/* optionally get BSD define */
+#include <sys/param.h>			/* optionally get BSD define */
 #ifdef HAVE_ZEROCOPY_BPF
 #include <sys/mman.h>
 #endif

freebsd/contrib/libpcap/pcap-int.h

@@ -219,7 +219,7 @@ struct pcap_opt {
  * line up on a nice boundary.
  */
 #ifdef __NetBSD__
-#include <rtems/bsd/sys/param.h>	/* needed to declare __NetBSD_Version__ */
+#include <sys/param.h>	/* needed to declare __NetBSD_Version__ */
 #endif
 
 #if defined(ultrix) || defined(__osf__) || (defined(__NetBSD__) && __NetBSD_Version__ > 106000000)

freebsd/contrib/libxo/libxo/xo_encoder.c

@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <dlfcn.h>
 
 #include "xo_config.h"

freebsd/contrib/tcpdump/tcpdump-stdinc.h

@@ -117,7 +117,7 @@ typedef char* caddr_t;
 #ifdef HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
 #endif
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/types.h>			/* concession to AIX */
 #include <sys/time.h>
 #include <sys/socket.h>

freebsd/include/arpa/nameser.h

@@ -56,7 +56,7 @@
 
 #define BIND_4_COMPAT
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
 

freebsd/include/resolv.h

@@ -53,7 +53,7 @@
 #ifndef _RESOLV_H_
 #define	_RESOLV_H_
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/socket.h>

freebsd/lib/lib80211/lib80211_ioctl.c

@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

freebsd/lib/lib80211/lib80211_regdomain.c

@@ -38,8 +38,8 @@ static const char rcsid[] = "$FreeBSD$";
 #define sbuf_new	_bsd_sbuf_new
 #endif /* __rtems__ */
 #include <sys/types.h>
-#include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/errno.h>
+#include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/sbuf.h>
 #include <sys/stat.h>

freebsd/lib/libc/db/btree/bt_close.c

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <errno.h>
 #include <stdio.h>

freebsd/lib/libc/db/btree/bt_conv.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 

freebsd/lib/libc/db/btree/bt_debug.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdlib.h>

freebsd/lib/libc/db/btree/bt_open.c

@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <errno.h>

freebsd/lib/libc/db/btree/bt_overflow.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdlib.h>

freebsd/lib/libc/db/btree/bt_split.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <limits.h>
 #include <stdio.h>

freebsd/lib/libc/db/btree/bt_utils.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdlib.h>

freebsd/lib/libc/db/mpool/mpool.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mpool.c	8.7 (Berkeley) 11/2/95";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 

freebsd/lib/libc/db/recno/rec_utils.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 #include <stdlib.h>

freebsd/lib/libc/gen/getdomainname.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <unistd.h>

freebsd/lib/libc/gen/gethostname.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <errno.h>

freebsd/lib/libc/gen/sethostname.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <unistd.h>

freebsd/lib/libc/inet/inet_addr.c

@@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/inet_lnaof.c

@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

freebsd/lib/libc/inet/inet_makeaddr.c

@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

freebsd/lib/libc/inet/inet_netof.c

@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

freebsd/lib/libc/inet/inet_ntop.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/inet/inet_pton.c

@@ -24,7 +24,7 @@ static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Ex
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/inet/nsap_addr.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/isc/eventlib_p.h

@@ -26,7 +26,7 @@
 #ifndef _EVENTLIB_P_H
 #define _EVENTLIB_P_H
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>

freebsd/lib/libc/net/base64.c

@@ -45,7 +45,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/net/ether_addr.c

@@ -42,7 +42,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <net/ethernet.h>

freebsd/lib/libc/net/getaddrinfo.c

@@ -57,7 +57,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>

freebsd/lib/libc/net/gethostbydns.c

@@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/gethostbyht.c

@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/gethostbynis.c

@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/gethostnamadr.c

@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/getifaddrs.c

@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 #ifdef	NET_RT_IFLIST
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <net/route.h>
 #include <sys/sysctl.h>
 #include <net/if_dl.h>

freebsd/lib/libc/net/getifmaddrs.c

@@ -30,7 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>

freebsd/lib/libc/net/getnetbydns.c

@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/getnetbynis.c

@@ -28,7 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/getnetnamadr.c

@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/getprotoent.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <limits.h>

freebsd/lib/libc/net/getservent.c

@@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <db.h>

freebsd/lib/libc/net/ip6opt.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/net/map_v4v6.c

@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/net/name6.c

@@ -89,7 +89,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/queue.h>

freebsd/lib/libc/net/nsdispatch.c

@@ -66,7 +66,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <dlfcn.h>

freebsd/lib/libc/net/rcmd.c

@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 

freebsd/lib/libc/net/rthdr.c

@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/resolv/herror.c

@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include "port_before.h"
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/uio.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/resolv/res_comp.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <ctype.h>

freebsd/lib/libc/resolv/res_data.c

@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 

freebsd/lib/libc/resolv/res_debug.c

@@ -100,7 +100,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

freebsd/lib/libc/resolv/res_findzonecut.c

@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 

freebsd/lib/libc/resolv/res_init.c

@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>

freebsd/lib/libc/resolv/res_mkquery.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <netdb.h>

freebsd/lib/libc/resolv/res_mkupdate.c

@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/resolv/res_query.c

@@ -74,7 +74,7 @@ static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka E
 __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>

freebsd/lib/libc/resolv/res_send.c

@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/uio.h>

freebsd/lib/libc/resolv/res_update.c

@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 

freebsd/lib/libc/rpc/auth_time.c

@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <netdb.h>
 #include <sys/signal.h>
-#include <rtems/bsd/sys/errno.h>
+#include <sys/errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

freebsd/lib/libc/rpc/auth_unix.c

@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <assert.h>
 #include <err.h>

freebsd/lib/libc/rpc/clnt_simple.c

@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <stdio.h>
 #include <errno.h>
 #include <rpc/rpc.h>

freebsd/lib/libc/rpc/getrpcent.c

@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
  * Copyright (c) 1984 by Sun Microsystems, Inc.
  */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <assert.h>

freebsd/lib/libc/rpc/netname.c

@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <rpc/rpc.h>
 #include <rpc/rpc_com.h>
 #ifdef YP

freebsd/lib/libc/rpc/netnamer.c

@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
  * architecture.
  */
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <rpc/rpc.h>
 #include <rpc/rpc_com.h>
 #ifdef YP

freebsd/lib/libc/rpc/rpc_generic.c

@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/un.h>

freebsd/lib/libc/rpc/rpc_prot.c

@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <assert.h>
 

freebsd/lib/libc/rpc/svc_auth_des.c

@@ -54,7 +54,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <rpc/des_crypt.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <netinet/in.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>

freebsd/lib/libc/rpc/svc_vc.c

@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include "reentrant.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>

freebsd/lib/libc/xdr/xdr_float.c

@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "namespace.h"
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <stdio.h>
 

freebsd/lib/libipsec/ipsec_dump_policy.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netipsec/key_var.h>

freebsd/lib/libipsec/ipsec_get_policylen.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <netipsec/ipsec.h>
 

freebsd/lib/libipsec/ipsec_strerror.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <string.h>
 #include <netipsec/ipsec.h>

freebsd/lib/libipsec/pfkey.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <net/pfkeyv2.h>
 #include <netipsec/key_var.h>

freebsd/lib/libipsec/pfkey_dump.c

@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/pfkeyv2.h>

freebsd/lib/libmemstat/memstat.c

@@ -28,7 +28,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include <err.h>

freebsd/lib/libmemstat/memstat_malloc.c

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 

freebsd/lib/libmemstat/memstat_uma.c

@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/cpuset.h>
+#include <sys/param.h>
+#include <sys/cpuset.h>
 #include <sys/sysctl.h>
 
 #include <vm/uma.h>

freebsd/lib/libutil/trimdomain.c

@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <libutil.h>
 #include <string.h>

freebsd/sbin/dhclient/dhcpd.h

@@ -41,7 +41,7 @@
  * $FreeBSD$
  */
 
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/af_inet.c

@@ -41,7 +41,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>

freebsd/sbin/ifconfig/af_inet6.c

@@ -41,7 +41,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>

freebsd/sbin/ifconfig/af_nd6.c

@@ -37,7 +37,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

freebsd/sbin/ifconfig/ifbridge.c

@@ -47,7 +47,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/ifcarp.c

@@ -36,7 +36,7 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/ifclone.c

@@ -41,7 +41,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/socket.h>

freebsd/sbin/ifconfig/ifconfig.c

@@ -55,7 +55,7 @@ static const char rcsid[] =
 #include <machine/rtems-bsd-program.h>
 #include <machine/rtems-bsd-commands.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/module.h>
 #include <sys/linker.h>

freebsd/sbin/ifconfig/ifgif.c

@@ -37,7 +37,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/ifgre.c

@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/ifgroup.c

@@ -37,7 +37,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <net/if.h>

freebsd/sbin/ifconfig/ifieee80211.c

@@ -66,7 +66,7 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

freebsd/sbin/ifconfig/iflagg.c

@@ -15,7 +15,7 @@ static const char rcsid[] =
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

freebsd/sbin/ifconfig/ifmac.c

@@ -43,7 +43,7 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/mac.h>
 #include <sys/socket.h>

freebsd/sbin/ifconfig/ifmedia.c

@@ -71,7 +71,7 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>

freebsd/sbin/ifconfig/ifpfsync.c

@@ -35,7 +35,7 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-program.h>
 #endif /* __rtems__ */
-#include <rtems/bsd/sys/param.h>
+#include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>