diff options
18 files changed, 27 insertions, 41 deletions
diff --git a/freebsd-userspace/commands/sbin/ping/ping.c b/freebsd-userspace/commands/sbin/ping/ping.c index 0ddf4db6..6014b743 100644 --- a/freebsd-userspace/commands/sbin/ping/ping.c +++ b/freebsd-userspace/commands/sbin/ping/ping.c @@ -1,5 +1,4 @@ #ifdef __rtems__ -#include "port_before.h" #define __need_getopt_newlib #include <getopt.h> #endif diff --git a/freebsd-userspace/commands/sbin/ping6/ping6.c b/freebsd-userspace/commands/sbin/ping6/ping6.c index 62cb492b..20b5f7ba 100644 --- a/freebsd-userspace/commands/sbin/ping6/ping6.c +++ b/freebsd-userspace/commands/sbin/ping6/ping6.c @@ -1,8 +1,6 @@ #ifdef __rtems__ #define USE_RFC2292BIS -#include "port_before.h" - #define __need_getopt_newlib #include <getopt.h> #endif diff --git a/freebsd-userspace/lib/libc/inet/inet_addr.c b/freebsd-userspace/lib/libc/inet/inet_addr.c index 2774ca4c..e606d345 100644 --- a/freebsd-userspace/lib/libc/inet/inet_addr.c +++ b/freebsd-userspace/lib/libc/inet/inet_addr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -73,6 +71,8 @@ static const char rcsid[] = "$Id: inet_addr.c,v 1.4.18.1 2005/04/27 05:00:52 sra #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/param.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c b/freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c index 7ed57322..645b3cd5 100644 --- a/freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c +++ b/freebsd-userspace/lib/libc/inet/inet_cidr_ntop.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1998,1999 by Internet Software Consortium. @@ -21,6 +19,8 @@ static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:47 marka Exp $"; #endif +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_cidr_pton.c b/freebsd-userspace/lib/libc/inet/inet_cidr_pton.c index a0bb4410..b0586ff3 100644 --- a/freebsd-userspace/lib/libc/inet/inet_cidr_pton.c +++ b/freebsd-userspace/lib/libc/inet/inet_cidr_pton.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1998,1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:5 #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_lnaof.c b/freebsd-userspace/lib/libc/inet/inet_lnaof.c index 3cd73285..7cab8946 100644 --- a/freebsd-userspace/lib/libc/inet/inet_lnaof.c +++ b/freebsd-userspace/lib/libc/inet/inet_lnaof.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +33,8 @@ static const char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_makeaddr.c b/freebsd-userspace/lib/libc/inet/inet_makeaddr.c index 33067d9e..04a37a03 100644 --- a/freebsd-userspace/lib/libc/inet/inet_makeaddr.c +++ b/freebsd-userspace/lib/libc/inet/inet_makeaddr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +33,8 @@ static const char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_net_ntop.c b/freebsd-userspace/lib/libc/inet/inet_net_ntop.c index b885a56a..867f441a 100644 --- a/freebsd-userspace/lib/libc/inet/inet_net_ntop.c +++ b/freebsd-userspace/lib/libc/inet/inet_net_ntop.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3.18.2 2006/06/20 02:51:32 #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_net_pton.c b/freebsd-userspace/lib/libc/inet/inet_net_pton.c index 976878c1..74df38b9 100644 --- a/freebsd-userspace/lib/libc/inet/inet_net_pton.c +++ b/freebsd-userspace/lib/libc/inet/inet_net_pton.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_neta.c b/freebsd-userspace/lib/libc/inet/inet_neta.c index e76791a4..72ac549f 100644 --- a/freebsd-userspace/lib/libc/inet/inet_neta.c +++ b/freebsd-userspace/lib/libc/inet/inet_neta.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: inet_neta.c,v 1.2.18.1 2005/04/27 05:00:53 sra #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_netof.c b/freebsd-userspace/lib/libc/inet/inet_netof.c index 08d880d6..8931c30f 100644 --- a/freebsd-userspace/lib/libc/inet/inet_netof.c +++ b/freebsd-userspace/lib/libc/inet/inet_netof.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +33,8 @@ static const char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_network.c b/freebsd-userspace/lib/libc/inet/inet_network.c index d7ad37c1..254db41a 100644 --- a/freebsd-userspace/lib/libc/inet/inet_network.c +++ b/freebsd-userspace/lib/libc/inet/inet_network.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +33,8 @@ static const char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_ntoa.c b/freebsd-userspace/lib/libc/inet/inet_ntoa.c index 4d36ab9f..f5d69fac 100644 --- a/freebsd-userspace/lib/libc/inet/inet_ntoa.c +++ b/freebsd-userspace/lib/libc/inet/inet_ntoa.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -36,6 +34,8 @@ static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sr #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_ntop.c b/freebsd-userspace/lib/libc/inet/inet_ntop.c index 62d4ba7a..6d210279 100644 --- a/freebsd-userspace/lib/libc/inet/inet_ntop.c +++ b/freebsd-userspace/lib/libc/inet/inet_ntop.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 mar #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/freebsd-userspace/lib/libc/inet/inet_pton.c b/freebsd-userspace/lib/libc/inet/inet_pton.c index db15551f..ae650990 100644 --- a/freebsd-userspace/lib/libc/inet/inet_pton.c +++ b/freebsd-userspace/lib/libc/inet/inet_pton.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. @@ -23,6 +21,7 @@ static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 mar #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" #include <sys/param.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/freebsd-userspace/lib/libc/inet/nsap_addr.c b/freebsd-userspace/lib/libc/inet/nsap_addr.c index 3efd1e0f..29474729 100644 --- a/freebsd-userspace/lib/libc/inet/nsap_addr.c +++ b/freebsd-userspace/lib/libc/inet/nsap_addr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-1999 by Internet Software Consortium. @@ -23,6 +21,8 @@ static const char rcsid[] = "$Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 mar #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "port_before.h" + #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> diff --git a/freebsd-userspace/rtems/syslog.c b/freebsd-userspace/rtems/syslog.c index 832d1ffd..10a75a61 100644 --- a/freebsd-userspace/rtems/syslog.c +++ b/freebsd-userspace/rtems/syslog.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * RTEMS version of syslog and associated routines */ diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-config.h.in b/rtemsbsd/freebsd/machine/rtems-bsd-config.h.in index de55054d..8c73c4c7 100644 --- a/rtemsbsd/freebsd/machine/rtems-bsd-config.h.in +++ b/rtemsbsd/freebsd/machine/rtems-bsd-config.h.in @@ -31,10 +31,6 @@ /* XXX hack so /opt.../machine/param.h can disable MSIZE and use this one */ #define __NEW_RTEMS_BSD__ -/* Disable procedure call definitions */ -#undef __P -#undef __strong_reference - #ifndef _RTEMS_BSD_BSD_HH_ /* General defines to activate BSD kernel parts */ #define _KERNEL 1 @@ -45,10 +41,6 @@ #undef _SYS_TTYCOM_H_ #define _SYS_TTYCOM_H_ 1 -/* Disable procedure call definitions */ -#undef __P -#undef __strong_reference - /* Disable some quirks in the standard headers */ #define _POSIX_SOURCE 1 |