Include <sys/cdefs.h> (Eliminate rtems/bsd/sys/cdefs.h).

2011-03-24 09:36:14 +00:00
parent 372a022be8
commit ee613aa252
41 changed files with 44 additions and 40 deletions
--- a/cpukit/libcsupport/include/sys/ioccom.h
+++ b/cpukit/libcsupport/include/sys/ioccom.h
@@ -88,7 +88,7 @@

 #ifndef _KERNEL

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #ifndef __ioctl_command_defined
 typedef u_int32_t ioctl_command_t;
--- a/cpukit/libnetworking/arpa/inet.h
+++ b/cpukit/libnetworking/arpa/inet.h
@@ -64,7 +64,7 @@

 /* External definitions for functions in inet(3). */

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>

 /* Required for byteorder(3) functions. */
--- a/cpukit/libnetworking/arpa/nameser.h
+++ b/cpukit/libnetworking/arpa/nameser.h
@@ -63,7 +63,7 @@
 #define BIND_4_COMPAT

 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*
 * revision information.  this is the release date in YYYYMMDD format.
--- a/cpukit/libnetworking/ifaddrs.h
+++ b/cpukit/libnetworking/ifaddrs.h
@@ -46,7 +46,7 @@ struct ifaddrs {
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 #endif
 
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 __BEGIN_DECLS
 extern int getifaddrs(struct ifaddrs **);
--- a/cpukit/libnetworking/libc/gethostbydns.c
+++ b/cpukit/libnetworking/libc/gethostbydns.c
@@ -57,7 +57,7 @@
 #include "config.h"
 #endif

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <sys/types.h>
 #include <sys/param.h>
--- a/cpukit/libnetworking/libc/getifaddrs.c
+++ b/cpukit/libnetworking/libc/getifaddrs.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <sys/types.h>
 #include <sys/ioctl.h>
--- a/cpukit/libnetworking/libc/if_indextoname.c
+++ b/cpukit/libnetworking/libc/if_indextoname.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <sys/types.h>
 #include <sys/socket.h>
--- a/cpukit/libnetworking/libc/if_nameindex.c
+++ b/cpukit/libnetworking/libc/if_nameindex.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <sys/types.h>
 #include <sys/socket.h>
--- a/cpukit/libnetworking/libc/res_stubs.c
+++ b/cpukit/libnetworking/libc/res_stubs.c
@@ -43,7 +43,7 @@
 #endif

 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 __weak_reference(__inet_addr, inet_addr);
 __weak_reference(__inet_aton, inet_aton);
--- a/cpukit/libnetworking/machine/in_cksum.h
+++ b/cpukit/libnetworking/machine/in_cksum.h
@@ -39,7 +39,7 @@
 #ifndef _MACHINE_IN_CKSUM_H_
 #define	_MACHINE_IN_CKSUM_H_	1

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <netinet/ip.h> /* struct ip */

 /*
--- a/cpukit/libnetworking/net/ethernet.h
+++ b/cpukit/libnetworking/net/ethernet.h
@@ -369,7 +369,7 @@ extern	char *ether_sprintf(const u_int8_t *);

 #else /* _KERNEL */

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*
 * Ethernet address conversion/parsing routines.
--- a/cpukit/libnetworking/net/if.h
+++ b/cpukit/libnetworking/net/if.h
@@ -37,7 +37,7 @@
 #ifndef _NET_IF_H_
 #define	_NET_IF_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #if defined(__rtems__)
 /*
--- a/cpukit/libnetworking/net/if_dl.h
+++ b/cpukit/libnetworking/net/if_dl.h
@@ -74,7 +74,7 @@ struct sockaddr_dl {

 #ifndef _KERNEL

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 __BEGIN_DECLS
 void	link_addr(const char *, struct sockaddr_dl *);
--- a/cpukit/libnetworking/netdb.h
+++ b/cpukit/libnetworking/netdb.h
@@ -65,7 +65,7 @@
 #ifndef _NETDB_H_
 #define _NETDB_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>

 #ifndef _SOCKLEN_T_DECLARED
--- a/cpukit/libnetworking/netinet/ip.h
+++ b/cpukit/libnetworking/netinet/ip.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_IP_H_
 #define _NETINET_IP_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*
 * Definitions for internet protocol version 4.
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/cpukit/libnetworking/netinet/tcp.h
@@ -37,7 +37,7 @@
 #ifndef _NETINET_TCP_H_
 #define _NETINET_TCP_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #if __BSD_VISIBLE

--- a/cpukit/libnetworking/netinet/tcp_debug.c
+++ b/cpukit/libnetworking/netinet/tcp_debug.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"

--- a/cpukit/libnetworking/resolv.h
+++ b/cpukit/libnetworking/resolv.h
@@ -59,7 +59,7 @@

 #include <sys/param.h>
 #include <sys/types.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <stdio.h>

 /*
--- a/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -36,7 +36,7 @@ typedef u_int32_t ioctl_command_t;
 /* make sure we get the network versions of these */
 #include <machine/types.h>
 #include <machine/param.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <sys/time.h>

--- a/cpukit/libnetworking/sys/libkern.h
+++ b/cpukit/libnetworking/sys/libkern.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_LIBKERN_H_
 #define	_SYS_LIBKERN_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/types.h>

 /* BCD conversions. */
--- a/cpukit/libnetworking/sys/mount.h
+++ b/cpukit/libnetworking/sys/mount.h
@@ -116,7 +116,7 @@ typedef struct fhandle	fhandle_t;

 #else /* !_KERNEL */

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #endif /* _KERNEL */

--- a/cpukit/libnetworking/sys/poll.h
+++ b/cpukit/libnetworking/sys/poll.h
@@ -31,7 +31,7 @@
 #ifndef _SYS_POLL_H_
 #define	_SYS_POLL_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*
 * This file is intended to be compatible with the traditional poll.h.
--- a/cpukit/libnetworking/sys/socket.h
+++ b/cpukit/libnetworking/sys/socket.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_SOCKET_H_
 #define	_SYS_SOCKET_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>

 /*
--- a/cpukit/libnetworking/sys/sysctl.h
+++ b/cpukit/libnetworking/sys/sysctl.h
@@ -630,7 +630,7 @@ int	sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
 int	sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);

 #else	/* !_KERNEL */
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 __BEGIN_DECLS
 int	sysctl(int *, u_int, void *, size_t *, void *, size_t);
--- a/cpukit/libnetworking/sys/syslog.h
+++ b/cpukit/libnetworking/sys/syslog.h
@@ -178,7 +178,7 @@ CODE facilitynames[] = {

 #else /* not _KERNEL */

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <stdarg.h>

 __BEGIN_DECLS
--- a/cpukit/libnetworking/sys/systm.h
+++ b/cpukit/libnetworking/sys/systm.h
@@ -45,6 +45,10 @@
 #include <rtems/rtems_bsdnet_internal.h> /* for __BSD_VA_LIST__ */
 #include <machine/cpufunc.h>

+#if !defined(__dead2)
+#define __dead2         __attribute__((__noreturn__))
+#endif
+
 extern int securelevel;		/* system security level (see init(8)) */

 extern int cold;		/* nonzero if we are doing a cold boot */
--- a/cpukit/libnetworking/sys/uio.h
+++ b/cpukit/libnetworking/sys/uio.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_UIO_H_
 #define	_SYS_UIO_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/types.h>

 /*
--- a/cpukit/libnetworking/sys/un.h
+++ b/cpukit/libnetworking/sys/un.h
@@ -37,7 +37,7 @@
 #ifndef _SYS_UN_H_
 #define _SYS_UN_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <rtems/bsdnet/_types.h>

 #ifndef _SA_FAMILY_T_DECLARED
--- a/cpukit/librpc/include/rpc/auth.h
+++ b/cpukit/librpc/include/rpc/auth.h
@@ -43,7 +43,7 @@

 #ifndef _RPC_AUTH_H
 #define _RPC_AUTH_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/socket.h>

 #define MAX_AUTH_BYTES	400
--- a/cpukit/librpc/include/rpc/auth_unix.h
+++ b/cpukit/librpc/include/rpc/auth_unix.h
@@ -46,7 +46,7 @@

 #ifndef _RPC_AUTH_UNIX_H
 #define _RPC_AUTH_UNIX_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
--- a/cpukit/librpc/include/rpc/clnt.h
+++ b/cpukit/librpc/include/rpc/clnt.h
@@ -64,7 +64,7 @@
 #ifndef _RPC_CLNT_H_
 #define _RPC_CLNT_H_
 #include <rpc/clnt_stat.h>
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>
 #include <sys/un.h>

 /*
--- a/cpukit/librpc/include/rpc/clnt_soc.h
+++ b/cpukit/librpc/include/rpc/clnt_soc.h
@@ -47,7 +47,7 @@
 * with TS-RPC.
 */

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  

--- a/cpukit/librpc/include/rpc/pmap_clnt.h
+++ b/cpukit/librpc/include/rpc/pmap_clnt.h
@@ -62,7 +62,7 @@

 #ifndef _RPC_PMAPCLNT_H
 #define _RPC_PMAPCLNT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 __BEGIN_DECLS
 extern bool_t		pmap_set	(u_long, u_long, int, int);
--- a/cpukit/librpc/include/rpc/pmap_prot.h
+++ b/cpukit/librpc/include/rpc/pmap_prot.h
@@ -70,7 +70,7 @@

 #ifndef _RPC_PMAPPROT_H
 #define _RPC_PMAPPROT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #define PMAPPORT		((u_short)111)
 #define PMAPPROG		((u_long)100000)
--- a/cpukit/librpc/include/rpc/pmap_rmt.h
+++ b/cpukit/librpc/include/rpc/pmap_rmt.h
@@ -40,7 +40,7 @@

 #ifndef _RPC_PMAPRMT_H
 #define _RPC_PMAPRMT_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 struct rmtcallargs {
 	u_long prog, vers, proc, arglen;
--- a/cpukit/librpc/include/rpc/rpc_com.h
+++ b/cpukit/librpc/include/rpc/rpc_com.h
@@ -46,7 +46,7 @@
 #ifndef _RPC_RPCCOM_H
 #define	_RPC_RPCCOM_H

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */

--- a/cpukit/librpc/include/rpc/rpcent.h
+++ b/cpukit/librpc/include/rpc/rpcent.h
@@ -42,7 +42,7 @@
 #ifndef _RPC_RPCENT_H
 #define _RPC_RPCENT_H

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*	#pragma ident "@(#)rpcent.h   1.13    94/04/25 SMI"	*/
 /*      @(#)rpcent.h 1.1 88/12/06 SMI   */
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/cpukit/librpc/include/rpc/svc.h
@@ -39,7 +39,7 @@

 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /*
 * This interface must manage two items concerning remote procedure calling:
--- a/cpukit/librpc/include/rpc/svc_soc.h
+++ b/cpukit/librpc/include/rpc/svc_soc.h
@@ -39,7 +39,7 @@

 #ifndef _RPC_SVC_SOC_H
 #define _RPC_SVC_SOC_H
-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 /* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
 /*      svc_soc.h 1.8 89/05/01 SMI      */
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/cpukit/librpc/include/rpc/xdr.h
@@ -42,7 +42,7 @@
 #ifndef _RPC_XDR_H
 #define _RPC_XDR_H

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #include <rpc/types.h>

--- a/cpukit/librpc/include/rpcsvc/ypclnt.h
+++ b/cpukit/librpc/include/rpcsvc/ypclnt.h
@@ -32,7 +32,7 @@
 #ifndef _RPCSVC_YPCLNT_H_
 #define _RPCSVC_YPCLNT_H_

-#include <rtems/bsd/sys/cdefs.h>
+#include <sys/cdefs.h>

 #define YPERR_BADARGS	1		/* args to function are bad */
 #define YPERR_RPC	2		/* RPC failure */