diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/lib | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/lib')
108 files changed, 183 insertions, 292 deletions
diff --git a/freebsd/lib/libc/db/btree/bt_close.c b/freebsd/lib/libc/db/btree/bt_close.c index b15d67ca..76220443 100644 --- a/freebsd/lib/libc/db/btree/bt_close.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_conv.c b/freebsd/lib/libc/db/btree/bt_conv.c index d84da442..91cbf872 100644 --- a/freebsd/lib/libc/db/btree/bt_conv.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_debug.c b/freebsd/lib/libc/db/btree/bt_debug.c index ce7849a9..c8c5878c 100644 --- a/freebsd/lib/libc/db/btree/bt_debug.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/btree/bt_delete.c b/freebsd/lib/libc/db/btree/bt_delete.c index ac295016..258e318b 100644 --- a/freebsd/lib/libc/db/btree/bt_delete.c +++ b/freebsd/lib/libc/db/btree/bt_delete.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_get.c b/freebsd/lib/libc/db/btree/bt_get.c index b335e1ba..23f629b8 100644 --- a/freebsd/lib/libc/db/btree/bt_get.c +++ b/freebsd/lib/libc/db/btree/bt_get.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_get.c 8.6 (Berkeley) 7/20/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stddef.h> diff --git a/freebsd/lib/libc/db/btree/bt_open.c b/freebsd/lib/libc/db/btree/bt_open.c index 1e37c0e5..1be97b49 100644 --- a/freebsd/lib/libc/db/btree/bt_open.c +++ b/freebsd/lib/libc/db/btree/bt_open.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); */ #include "namespace.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/stat.h> #include <errno.h> diff --git a/freebsd/lib/libc/db/btree/bt_overflow.c b/freebsd/lib/libc/db/btree/bt_overflow.c index 7079453a..8d6ebc4d 100644 --- a/freebsd/lib/libc/db/btree/bt_overflow.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/btree/bt_page.c b/freebsd/lib/libc/db/btree/bt_page.c index dc30566b..c04c1ca9 100644 --- a/freebsd/lib/libc/db/btree/bt_page.c +++ b/freebsd/lib/libc/db/btree/bt_page.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)bt_page.c 8.3 (Berkeley) 7/14/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_put.c b/freebsd/lib/libc/db/btree/bt_put.c index 51c241c7..ee1d22f9 100644 --- a/freebsd/lib/libc/db/btree/bt_put.c +++ b/freebsd/lib/libc/db/btree/bt_put.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_search.c b/freebsd/lib/libc/db/btree/bt_search.c index d5e859bc..68245d89 100644 --- a/freebsd/lib/libc/db/btree/bt_search.c +++ b/freebsd/lib/libc/db/btree/bt_search.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_seq.c b/freebsd/lib/libc/db/btree/bt_seq.c index 5e92c855..0f294a83 100644 --- a/freebsd/lib/libc/db/btree/bt_seq.c +++ b/freebsd/lib/libc/db/btree/bt_seq.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stddef.h> diff --git a/freebsd/lib/libc/db/btree/bt_split.c b/freebsd/lib/libc/db/btree/bt_split.c index e47de805..1957b636 100644 --- a/freebsd/lib/libc/db/btree/bt_split.c +++ b/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 <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <limits.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/btree/bt_utils.c b/freebsd/lib/libc/db/btree/bt_utils.c index fbfff3ac..bdea59ae 100644 --- a/freebsd/lib/libc/db/btree/bt_utils.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/db/db/db.c b/freebsd/lib/libc/db/db/db.c index e450c626..beecad8e 100644 --- a/freebsd/lib/libc/db/db/db.c +++ b/freebsd/lib/libc/db/db/db.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <fcntl.h> @@ -51,6 +51,13 @@ dbopen(const char *fname, int flags, int mode, DBTYPE type, const void *openinfo { #define DB_FLAGS (DB_LOCK | DB_SHMEM | DB_TXN) +#ifdef __rtems__ +/* FIXME: Add lock capabilities to RTEMS file system */ +#define O_EXLOCK 0 +#define O_SHLOCK 0 +/* FIXME: Add no symlink follow capabilities to RTEMS file system */ +#define O_NOFOLLOW 0 +#endif /* __rtems__ */ #define USE_OPEN_FLAGS \ (O_CREAT | O_EXCL | O_EXLOCK | O_NOFOLLOW | O_NONBLOCK | \ O_RDONLY | O_RDWR | O_SHLOCK | O_SYNC | O_TRUNC) diff --git a/freebsd/lib/libc/db/mpool/mpool.c b/freebsd/lib/libc/db/mpool/mpool.c index ee7e143d..44ec0278 100644 --- a/freebsd/lib/libc/db/mpool/mpool.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/queue.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/db/recno/rec_close.c b/freebsd/lib/libc/db/recno/rec_close.c index 388ee4a9..32136bd7 100644 --- a/freebsd/lib/libc/db/recno/rec_close.c +++ b/freebsd/lib/libc/db/recno/rec_close.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rec_close.c 8.6 (Berkeley) 8/18/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/uio.h> #include <sys/mman.h> diff --git a/freebsd/lib/libc/db/recno/rec_delete.c b/freebsd/lib/libc/db/recno/rec_delete.c index ffaa50bf..fbaf65d6 100644 --- a/freebsd/lib/libc/db/recno/rec_delete.c +++ b/freebsd/lib/libc/db/recno/rec_delete.c @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/recno/rec_get.c b/freebsd/lib/libc/db/recno/rec_get.c index ef749add..40f5bb16 100644 --- a/freebsd/lib/libc/db/recno/rec_get.c +++ b/freebsd/lib/libc/db/recno/rec_get.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_get.c 8.9 (Berkeley) 8/18/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stddef.h> diff --git a/freebsd/lib/libc/db/recno/rec_open.c b/freebsd/lib/libc/db/recno/rec_open.c index a0248aca..fbd2d9ae 100644 --- a/freebsd/lib/libc/db/recno/rec_open.c +++ b/freebsd/lib/libc/db/recno/rec_open.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)rec_open.c 8.10 (Berkeley) 9/1/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/mman.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/db/recno/rec_put.c b/freebsd/lib/libc/db/recno/rec_put.c index 58c1f566..a4fef549 100644 --- a/freebsd/lib/libc/db/recno/rec_put.c +++ b/freebsd/lib/libc/db/recno/rec_put.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_put.c 8.7 (Berkeley) 8/18/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/recno/rec_search.c b/freebsd/lib/libc/db/recno/rec_search.c index 2d98b95e..ac49ab4f 100644 --- a/freebsd/lib/libc/db/recno/rec_search.c +++ b/freebsd/lib/libc/db/recno/rec_search.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rec_search.c 8.4 (Berkeley) 7/14/94"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/freebsd/lib/libc/db/recno/rec_seq.c b/freebsd/lib/libc/db/recno/rec_seq.c index b6430aab..90f34b6c 100644 --- a/freebsd/lib/libc/db/recno/rec_seq.c +++ b/freebsd/lib/libc/db/recno/rec_seq.c @@ -36,7 +36,7 @@ static char sccsid[] __unused = "@(#)rec_seq.c 8.3 (Berkeley) 7/14/94"; #endif /* not lint */ __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <errno.h> #include <limits.h> diff --git a/freebsd/lib/libc/db/recno/rec_utils.c b/freebsd/lib/libc/db/recno/rec_utils.c index 4bd45301..a8952da1 100644 --- a/freebsd/lib/libc/db/recno/rec_utils.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <stdio.h> #include <stdlib.h> diff --git a/freebsd/lib/libc/gen/gethostname.c b/freebsd/lib/libc/gen/gethostname.c index f744652c..44c7770a 100644 --- a/freebsd/lib/libc/gen/gethostname.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/sysctl.h> #include <errno.h> diff --git a/freebsd/lib/libc/include/isc/eventlib.h b/freebsd/lib/libc/include/isc/eventlib.h index 50038231..9713be3c 100644 --- a/freebsd/lib/libc/include/isc/eventlib.h +++ b/freebsd/lib/libc/include/isc/eventlib.h @@ -24,9 +24,9 @@ #ifndef _EVENTLIB_H #define _EVENTLIB_H -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/uio.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <stdio.h> #include <isc/platform.h> diff --git a/freebsd/lib/libc/include/isc/platform.h b/freebsd/lib/libc/include/isc/platform.h index bd11a255..a0513be8 100644 --- a/freebsd/lib/libc/include/isc/platform.h +++ b/freebsd/lib/libc/include/isc/platform.h @@ -1,40 +1,37 @@ /* - * Copyright (C) 1999-2001 Internet Software Consortium. + * Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC") * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM - * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, - * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.28 2001/11/19 03:08:26 mayer Exp $ */ - -#ifndef ISC_PLATFORM_H -#define ISC_PLATFORM_H 1 +/* $Id: platform.h.in,v 1.2.6.2 2008/01/23 02:15:02 tbox Exp $ */ +/* $FreeBSD$ */ +/*! \file */ -#ifndef ISC_PLATFORM_USEDECLSPEC -#define LIBISC_EXTERNAL_DATA -#define LIBDNS_EXTERNAL_DATA -#define LIBISCCC_EXTERNAL_DATA -#define LIBISCCFG_EXTERNAL_DATA -#define LIBBIND9_EXTERNAL_DATA -#endif /* ISC_PLATFORM_USEDECLSPEC */ +#ifndef ISC_PLATFORM_H +#define ISC_PLATFORM_H /* - * Tell emacs to use C mode for this file. - * - * Local Variables: - * mode: c - * End: + * Define if the OS does not define struct timespec. */ +#undef ISC_PLATFORM_NEEDTIMESPEC +#ifdef ISC_PLATFORM_NEEDTIMESPEC +#include <time.h> /* For time_t */ +struct timespec { + time_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; +#endif -#endif /* ISC_PLATFORM_H */ +#endif diff --git a/freebsd/lib/libc/include/libc_private.h b/freebsd/lib/libc/include/libc_private.h index 060f77e0..c72b41ee 100644 --- a/freebsd/lib/libc/include/libc_private.h +++ b/freebsd/lib/libc/include/libc_private.h @@ -43,9 +43,9 @@ */ #ifdef __rtems__ #define __isthreaded 1 -#else +#else /* __rtems__ */ extern int __isthreaded; -#endif +#endif /* __rtems__ */ /* * libc should use libc_dlopen internally, which respects a global @@ -203,7 +203,7 @@ extern void (*__cleanup)(void); * for the wrapped "new" pad-less syscalls are here for now. */ extern int __getosreldate(void); -#include <sys/_types.h> +#include <rtems/bsd/sys/_types.h> /* Without pad */ extern __off_t __sys_lseek(int, __off_t, int); extern int __sys_ftruncate(int, __off_t); diff --git a/freebsd/lib/libc/include/port_before.h b/freebsd/lib/libc/include/port_before.h index 64075171..304dd66d 100644 --- a/freebsd/lib/libc/include/port_before.h +++ b/freebsd/lib/libc/include/port_before.h @@ -1,22 +1,15 @@ -#include <freebsd/bsd.h> +/* $FreeBSD$ */ -#include <freebsd/sys/_types.h> +#ifndef _PORT_BEFORE_H_ +#define _PORT_BEFORE_H_ -/********************************************************************* - * These are also defined in the FreeBSD version of this file. - *********************************************************************/ +#define _LIBC 1 +#define DO_PTHREADS 1 +#define USE_KQUEUE 1 -#define _LIBC 1 -/* - * This is defined in the FreeBSD source but we have no code yet which - * relies upon it. - */ -/* #define DO_PTHREADS 1 */ -#define USE_KQUEUE 1 - -#define ISC_SOCKLEN_T socklen_t +#define ISC_SOCKLEN_T socklen_t #define ISC_FORMAT_PRINTF(fmt, args) \ - __attribute__((__format__(__printf__, fmt, args))) + __attribute__((__format__(__printf__, fmt, args))) #define DE_CONST(konst, var) \ do { \ union { const void *k; void *v; } _u; \ @@ -24,18 +17,6 @@ var = _u.v; \ } while (0) -#define UNUSED(x) (x) = (x) - - -/********************************************************************* - * FROM HERE DOWN, THESE ARE NOT IN THE FreeBSD VERSION!!! - *********************************************************************/ -#ifndef __ssize_t -#define __ssize_t ssize_t -#endif - -#include <freebsd/machine/_align.h> +#define UNUSED(x) (void)(x) -#ifdef __rtems__ -#include <freebsd/machine/endian.h> -#endif +#endif /* _PORT_BEFORE_H_ */ diff --git a/freebsd/lib/libc/include/resolv_mt.h b/freebsd/lib/libc/include/resolv_mt.h index 27963a12..a12f2563 100644 --- a/freebsd/lib/libc/include/resolv_mt.h +++ b/freebsd/lib/libc/include/resolv_mt.h @@ -1,7 +1,7 @@ #ifndef _RESOLV_MT_H #define _RESOLV_MT_H -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> diff --git a/freebsd/lib/libc/include/spinlock.h b/freebsd/lib/libc/include/spinlock.h index c9facc51..e55b569f 100644 --- a/freebsd/lib/libc/include/spinlock.h +++ b/freebsd/lib/libc/include/spinlock.h @@ -35,7 +35,7 @@ #ifndef _SPINLOCK_H_ #define _SPINLOCK_H_ #include <sys/cdefs.h> -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> /* * Lock structure with room for debugging information. diff --git a/freebsd/lib/libc/inet/inet_addr.c b/freebsd/lib/libc/inet/inet_addr.c index e606d345..dba40ac5 100644 --- a/freebsd/lib/libc/inet/inet_addr.c +++ b/freebsd/lib/libc/inet/inet_addr.c @@ -73,8 +73,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_cidr_ntop.c b/freebsd/lib/libc/inet/inet_cidr_ntop.c index 645b3cd5..482c831b 100644 --- a/freebsd/lib/libc/inet/inet_cidr_ntop.c +++ b/freebsd/lib/libc/inet/inet_cidr_ntop.c @@ -21,7 +21,7 @@ static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:4 #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/inet/inet_cidr_pton.c b/freebsd/lib/libc/inet/inet_cidr_pton.c index b0586ff3..06b6b7ed 100644 --- a/freebsd/lib/libc/inet/inet_cidr_pton.c +++ b/freebsd/lib/libc/inet/inet_cidr_pton.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/inet/inet_lnaof.c b/freebsd/lib/libc/inet/inet_lnaof.c index 7cab8946..ac9df5a3 100644 --- a/freebsd/lib/libc/inet/inet_lnaof.c +++ b/freebsd/lib/libc/inet/inet_lnaof.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_makeaddr.c b/freebsd/lib/libc/inet/inet_makeaddr.c index 04a37a03..449d7ddd 100644 --- a/freebsd/lib/libc/inet/inet_makeaddr.c +++ b/freebsd/lib/libc/inet/inet_makeaddr.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_net_ntop.c b/freebsd/lib/libc/inet/inet_net_ntop.c index 867f441a..9c9f734c 100644 --- a/freebsd/lib/libc/inet/inet_net_ntop.c +++ b/freebsd/lib/libc/inet/inet_net_ntop.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_net_pton.c b/freebsd/lib/libc/inet/inet_net_pton.c index 74df38b9..03980a74 100644 --- a/freebsd/lib/libc/inet/inet_net_pton.c +++ b/freebsd/lib/libc/inet/inet_net_pton.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/inet/inet_neta.c b/freebsd/lib/libc/inet/inet_neta.c index 72ac549f..1d08d95b 100644 --- a/freebsd/lib/libc/inet/inet_neta.c +++ b/freebsd/lib/libc/inet/inet_neta.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_netof.c b/freebsd/lib/libc/inet/inet_netof.c index 8931c30f..a81b42eb 100644 --- a/freebsd/lib/libc/inet/inet_netof.c +++ b/freebsd/lib/libc/inet/inet_netof.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_network.c b/freebsd/lib/libc/inet/inet_network.c index 254db41a..da3762b9 100644 --- a/freebsd/lib/libc/inet/inet_network.c +++ b/freebsd/lib/libc/inet/inet_network.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> #include <ctype.h> diff --git a/freebsd/lib/libc/inet/inet_ntoa.c b/freebsd/lib/libc/inet/inet_ntoa.c index f5d69fac..9b2e0e48 100644 --- a/freebsd/lib/libc/inet/inet_ntoa.c +++ b/freebsd/lib/libc/inet/inet_ntoa.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/inet_ntop.c b/freebsd/lib/libc/inet/inet_ntop.c index 6d210279..8984e8a4 100644 --- a/freebsd/lib/libc/inet/inet_ntop.c +++ b/freebsd/lib/libc/inet/inet_ntop.c @@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> -#include <sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/inet/inet_pton.c b/freebsd/lib/libc/inet/inet_pton.c index ae650990..ab16ec8f 100644 --- a/freebsd/lib/libc/inet/inet_pton.c +++ b/freebsd/lib/libc/inet/inet_pton.c @@ -22,8 +22,8 @@ static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 mar __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> -#include <sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/inet/nsap_addr.c b/freebsd/lib/libc/inet/nsap_addr.c index 29474729..3554b229 100644 --- a/freebsd/lib/libc/inet/nsap_addr.c +++ b/freebsd/lib/libc/inet/nsap_addr.c @@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/isc/ev_streams.c b/freebsd/lib/libc/isc/ev_streams.c index 06bdfad5..4ecb07ed 100644 --- a/freebsd/lib/libc/isc/ev_streams.c +++ b/freebsd/lib/libc/isc/ev_streams.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "fd_setsize.h" #endif -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/uio.h> #include <errno.h> diff --git a/freebsd/lib/libc/isc/eventlib_p.h b/freebsd/lib/libc/isc/eventlib_p.h index 951af003..aea5bd6a 100644 --- a/freebsd/lib/libc/isc/eventlib_p.h +++ b/freebsd/lib/libc/isc/eventlib_p.h @@ -26,8 +26,8 @@ #ifndef _EVENTLIB_P_H #define _EVENTLIB_P_H -#include <sys/param.h> -#include <sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/un.h> diff --git a/freebsd/lib/libc/nameser/ns_name.c b/freebsd/lib/libc/nameser/ns_name.c index ce7ee4d6..862db328 100644 --- a/freebsd/lib/libc/nameser/ns_name.c +++ b/freebsd/lib/libc/nameser/ns_name.c @@ -23,7 +23,7 @@ static const char rcsid[] = "$Id: ns_name.c,v 1.8.18.2 2005/04/27 05:01:08 sra E #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/nameser/ns_parse.c b/freebsd/lib/libc/nameser/ns_parse.c index 2d794eab..a3ff3cd9 100644 --- a/freebsd/lib/libc/nameser/ns_parse.c +++ b/freebsd/lib/libc/nameser/ns_parse.c @@ -25,7 +25,7 @@ static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 mark #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/nameser/ns_print.c b/freebsd/lib/libc/nameser/ns_print.c index a4095e00..7dc73b09 100644 --- a/freebsd/lib/libc/nameser/ns_print.c +++ b/freebsd/lib/libc/nameser/ns_print.c @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/nameser/ns_samedomain.c b/freebsd/lib/libc/nameser/ns_samedomain.c index 9c43c79e..93b06e83 100644 --- a/freebsd/lib/libc/nameser/ns_samedomain.c +++ b/freebsd/lib/libc/nameser/ns_samedomain.c @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <arpa/nameser.h> #include <errno.h> #include <string.h> diff --git a/freebsd/lib/libc/net/base64.c b/freebsd/lib/libc/net/base64.c index 6d3a79d6..70760b65 100644 --- a/freebsd/lib/libc/net/base64.c +++ b/freebsd/lib/libc/net/base64.c @@ -45,8 +45,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/net/ether_addr.c b/freebsd/lib/libc/net/ether_addr.c index a16b97d3..f0f63941 100644 --- a/freebsd/lib/libc/net/ether_addr.c +++ b/freebsd/lib/libc/net/ether_addr.c @@ -42,8 +42,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <net/ethernet.h> diff --git a/freebsd/lib/libc/net/gai_strerror.c b/freebsd/lib/libc/net/gai_strerror.c index b1feb7b8..4f60f2db 100644 --- a/freebsd/lib/libc/net/gai_strerror.c +++ b/freebsd/lib/libc/net/gai_strerror.c @@ -27,11 +27,6 @@ * SUCH DAMAGE. */ -#ifdef __rtems__ -#include <freebsd/machine/rtems-bsd-config.h> -#include <freebsd/sys/_types.h> -#endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/freebsd/lib/libc/net/getaddrinfo.c b/freebsd/lib/libc/net/getaddrinfo.c index b9b52794..aab02bf6 100644 --- a/freebsd/lib/libc/net/getaddrinfo.c +++ b/freebsd/lib/libc/net/getaddrinfo.c @@ -59,25 +59,18 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <net/if.h> #include <netinet/in.h> #include <sys/queue.h> #ifdef INET6 -#ifdef __rtems__ -#include <freebsd/net/if_var.h> -#include <sys/sysctl.h> -#include <sys/ioctl.h> -#include <freebsd/netinet6/in6_var.h> /* XXX */ -#else #include <net/if_var.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <netinet6/in6_var.h> /* XXX */ #endif -#endif #include <arpa/inet.h> #include <arpa/nameser.h> #include <rpc/rpc.h> diff --git a/freebsd/lib/libc/net/gethostbydns.c b/freebsd/lib/libc/net/gethostbydns.c index 2993a678..ba59bbc3 100644 --- a/freebsd/lib/libc/net/gethostbydns.c +++ b/freebsd/lib/libc/net/gethostbydns.c @@ -58,8 +58,8 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vi #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostbyht.c b/freebsd/lib/libc/net/gethostbyht.c index eb995b96..c9990cc4 100644 --- a/freebsd/lib/libc/net/gethostbyht.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostbynis.c b/freebsd/lib/libc/net/gethostbynis.c index 81f00932..5fa6725b 100644 --- a/freebsd/lib/libc/net/gethostbynis.c +++ b/freebsd/lib/libc/net/gethostbynis.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/gethostnamadr.c b/freebsd/lib/libc/net/gethostnamadr.c index d663e286..412ad57d 100644 --- a/freebsd/lib/libc/net/gethostnamadr.c +++ b/freebsd/lib/libc/net/gethostnamadr.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getifaddrs.c b/freebsd/lib/libc/net/getifaddrs.c index 2eceadb7..ddb8f437 100644 --- a/freebsd/lib/libc/net/getifaddrs.c +++ b/freebsd/lib/libc/net/getifaddrs.c @@ -35,12 +35,12 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> #ifdef NET_RT_IFLIST -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <net/route.h> #include <sys/sysctl.h> #include <net/if_dl.h> diff --git a/freebsd/lib/libc/net/getifmaddrs.c b/freebsd/lib/libc/net/getifmaddrs.c index 708c7ae2..23cf96e7 100644 --- a/freebsd/lib/libc/net/getifmaddrs.c +++ b/freebsd/lib/libc/net/getifmaddrs.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <sys/socket.h> diff --git a/freebsd/lib/libc/net/getnameinfo.c b/freebsd/lib/libc/net/getnameinfo.c index 4abd11ff..4b4d24a2 100644 --- a/freebsd/lib/libc/net/getnameinfo.c +++ b/freebsd/lib/libc/net/getnameinfo.c @@ -49,7 +49,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/freebsd/lib/libc/net/getnetbydns.c b/freebsd/lib/libc/net/getnetbydns.c index 7dd23837..8b7ccd4f 100644 --- a/freebsd/lib/libc/net/getnetbydns.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getnetbyht.c b/freebsd/lib/libc/net/getnetbyht.c index 1076cf21..bfede4b9 100644 --- a/freebsd/lib/libc/net/getnetbyht.c +++ b/freebsd/lib/libc/net/getnetbyht.c @@ -46,7 +46,7 @@ static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixi #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getnetbynis.c b/freebsd/lib/libc/net/getnetbynis.c index 805bc9d1..1d256a81 100644 --- a/freebsd/lib/libc/net/getnetbynis.c +++ b/freebsd/lib/libc/net/getnetbynis.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getnetnamadr.c b/freebsd/lib/libc/net/getnetnamadr.c index 7ae162c3..c5100a32 100644 --- a/freebsd/lib/libc/net/getnetnamadr.c +++ b/freebsd/lib/libc/net/getnetnamadr.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include "reentrant.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/getprotoent.c b/freebsd/lib/libc/net/getprotoent.c index c817cb5b..ae6584b0 100644 --- a/freebsd/lib/libc/net/getprotoent.c +++ b/freebsd/lib/libc/net/getprotoent.c @@ -35,8 +35,8 @@ static char sccsid[] = "@(#)getprotoent.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <errno.h> #include <limits.h> diff --git a/freebsd/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c index 65ffb2cb..486249d6 100644 --- a/freebsd/lib/libc/net/getservent.c +++ b/freebsd/lib/libc/net/getservent.c @@ -35,8 +35,8 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> #include <db.h> diff --git a/freebsd/lib/libc/net/if_indextoname.c b/freebsd/lib/libc/net/if_indextoname.c index efbcae86..ef201c56 100644 --- a/freebsd/lib/libc/net/if_indextoname.c +++ b/freebsd/lib/libc/net/if_indextoname.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <net/if_dl.h> #include <net/if.h> diff --git a/freebsd/lib/libc/net/if_nameindex.c b/freebsd/lib/libc/net/if_nameindex.c index 85073759..5b299300 100644 --- a/freebsd/lib/libc/net/if_nameindex.c +++ b/freebsd/lib/libc/net/if_nameindex.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <net/if_dl.h> #include <net/if.h> diff --git a/freebsd/lib/libc/net/if_nametoindex.c b/freebsd/lib/libc/net/if_nametoindex.c index a278ca07..132501b8 100644 --- a/freebsd/lib/libc/net/if_nametoindex.c +++ b/freebsd/lib/libc/net/if_nametoindex.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <sys/sockio.h> #include <net/if.h> @@ -40,9 +40,6 @@ __FBSDID("$FreeBSD$"); #include <errno.h> #include <unistd.h> #include "un-namespace.h" -#ifdef __rtems__ -#include <freebsd/sys/sockio.h> -#endif /* * From RFC 2553: diff --git a/freebsd/lib/libc/net/linkaddr.c b/freebsd/lib/libc/net/linkaddr.c index 761b5ae5..b2170444 100644 --- a/freebsd/lib/libc/net/linkaddr.c +++ b/freebsd/lib/libc/net/linkaddr.c @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <net/if_dl.h> #include <string.h> diff --git a/freebsd/lib/libc/net/map_v4v6.c b/freebsd/lib/libc/net/map_v4v6.c index 000ed9e2..0436c763 100644 --- a/freebsd/lib/libc/net/map_v4v6.c +++ b/freebsd/lib/libc/net/map_v4v6.c @@ -57,8 +57,8 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/net/name6.c b/freebsd/lib/libc/net/name6.c index 20763f88..a7abcb12 100644 --- a/freebsd/lib/libc/net/name6.c +++ b/freebsd/lib/libc/net/name6.c @@ -92,25 +92,18 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <sys/queue.h> #include <netinet/in.h> #ifdef INET6 #include <net/if.h> -#ifdef __rtems__ -#include <freebsd/net/if_var.h> -#include <sys/sysctl.h> -#include <sys/ioctl.h> -#include <freebsd/netinet6/in6_var.h> /* XXX */ -#else #include <net/if_var.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <netinet6/in6_var.h> /* XXX */ #endif -#endif #include <arpa/inet.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/net/nsdispatch.c b/freebsd/lib/libc/net/nsdispatch.c index dcd7438f..9262d3a1 100644 --- a/freebsd/lib/libc/net/nsdispatch.c +++ b/freebsd/lib/libc/net/nsdispatch.c @@ -73,14 +73,12 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/stat.h> #ifndef __rtems__ #include <dlfcn.h> -#else -#include <stdint.h> -#endif +#endif /* __rtems__ */ #include <errno.h> #include <fcntl.h> #define _NS_PRIVATE diff --git a/freebsd/lib/libc/net/rcmd.c b/freebsd/lib/libc/net/rcmd.c index 1045e88b..a5a7a0c6 100644 --- a/freebsd/lib/libc/net/rcmd.c +++ b/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 <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <sys/stat.h> diff --git a/freebsd/lib/libc/net/recv.c b/freebsd/lib/libc/net/recv.c index c625c0ac..c0103711 100644 --- a/freebsd/lib/libc/net/recv.c +++ b/freebsd/lib/libc/net/recv.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)recv.c 8.2 (Berkeley) 2/21/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <stddef.h> diff --git a/freebsd/lib/libc/net/send.c b/freebsd/lib/libc/net/send.c index 0ba2f4bc..8ab06ec9 100644 --- a/freebsd/lib/libc/net/send.c +++ b/freebsd/lib/libc/net/send.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)send.c 8.2 (Berkeley) 2/21/94"; __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/socket.h> #include <stddef.h> diff --git a/freebsd/lib/libc/resolv/h_errno.c b/freebsd/lib/libc/resolv/h_errno.c index 88d15aee..f627ff9b 100644 --- a/freebsd/lib/libc/resolv/h_errno.c +++ b/freebsd/lib/libc/resolv/h_errno.c @@ -25,7 +25,7 @@ * $FreeBSD$ */ -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> diff --git a/freebsd/lib/libc/resolv/herror.c b/freebsd/lib/libc/resolv/herror.c index 5a6e020e..aa50d774 100644 --- a/freebsd/lib/libc/resolv/herror.c +++ b/freebsd/lib/libc/resolv/herror.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" #include "namespace.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/uio.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/resolv/mtctxres.c b/freebsd/lib/libc/resolv/mtctxres.c index f02a7f50..4c915841 100644 --- a/freebsd/lib/libc/resolv/mtctxres.c +++ b/freebsd/lib/libc/resolv/mtctxres.c @@ -107,8 +107,10 @@ ___mtctxres(void) { mtctxres_t *mt; #ifdef _LIBC +#ifndef __rtems__ if (pthread_main_np() != 0) return (&sharedctx); +#endif /* __rtems__ */ #endif /* diff --git a/freebsd/lib/libc/resolv/res_comp.c b/freebsd/lib/libc/resolv/res_comp.c index cbddb6be..ac2a0752 100644 --- a/freebsd/lib/libc/resolv/res_comp.c +++ b/freebsd/lib/libc/resolv/res_comp.c @@ -74,8 +74,8 @@ static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 mark __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <ctype.h> diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c index 20ffe188..3aa0a3d4 100644 --- a/freebsd/lib/libc/resolv/res_data.c +++ b/freebsd/lib/libc/resolv/res_data.c @@ -25,10 +25,10 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/resolv/res_debug.c b/freebsd/lib/libc/resolv/res_debug.c index 317319ee..61c89f97 100644 --- a/freebsd/lib/libc/resolv/res_debug.c +++ b/freebsd/lib/libc/resolv/res_debug.c @@ -100,8 +100,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/freebsd/lib/libc/resolv/res_findzonecut.c b/freebsd/lib/libc/resolv/res_findzonecut.c index 23c1af4f..2e868e93 100644 --- a/freebsd/lib/libc/resolv/res_findzonecut.c +++ b/freebsd/lib/libc/resolv/res_findzonecut.c @@ -26,9 +26,9 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c index ec74e5bd..0b7d4682 100644 --- a/freebsd/lib/libc/resolv/res_init.c +++ b/freebsd/lib/libc/resolv/res_init.c @@ -77,10 +77,10 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/freebsd/lib/libc/resolv/res_mkquery.c b/freebsd/lib/libc/resolv/res_mkquery.c index 074817c4..f53caa39 100644 --- a/freebsd/lib/libc/resolv/res_mkquery.c +++ b/freebsd/lib/libc/resolv/res_mkquery.c @@ -74,8 +74,8 @@ static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 m __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <netdb.h> diff --git a/freebsd/lib/libc/resolv/res_mkupdate.c b/freebsd/lib/libc/resolv/res_mkupdate.c index 63f40cbe..98a21010 100644 --- a/freebsd/lib/libc/resolv/res_mkupdate.c +++ b/freebsd/lib/libc/resolv/res_mkupdate.c @@ -31,8 +31,8 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/resolv/res_query.c b/freebsd/lib/libc/resolv/res_query.c index 734e043a..f0f7a531 100644 --- a/freebsd/lib/libc/resolv/res_query.c +++ b/freebsd/lib/libc/resolv/res_query.c @@ -74,8 +74,8 @@ static const char rcsid[] = "$Id: res_query.c,v 1.7.18.2 2008/04/03 23:15:15 mar __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <netinet/in.h> #include <arpa/inet.h> #include <arpa/nameser.h> diff --git a/freebsd/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c index 0d52762c..7f421bba 100644 --- a/freebsd/lib/libc/resolv/res_send.c +++ b/freebsd/lib/libc/resolv/res_send.c @@ -84,9 +84,9 @@ __FBSDID("$FreeBSD$"); #endif #include "namespace.h" -#include <sys/types.h> -#include <sys/param.h> -#include <sys/time.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <rtems/bsd/sys/time.h> #include <sys/socket.h> #include <sys/uio.h> @@ -108,11 +108,7 @@ __FBSDID("$FreeBSD$"); #include "port_after.h" #ifdef USE_KQUEUE -#ifdef __rtems__ -#include <freebsd/sys/event.h> -#else #include <sys/event.h> -#endif /* __rtems__ */ #else #ifdef USE_POLL #ifdef HAVE_STROPTS_H diff --git a/freebsd/lib/libc/resolv/res_state.c b/freebsd/lib/libc/resolv/res_state.c index 8a82db7e..f3fc63c1 100644 --- a/freebsd/lib/libc/resolv/res_state.c +++ b/freebsd/lib/libc/resolv/res_state.c @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> diff --git a/freebsd/lib/libc/resolv/res_update.c b/freebsd/lib/libc/resolv/res_update.c index 58faac9c..5853831a 100644 --- a/freebsd/lib/libc/resolv/res_update.c +++ b/freebsd/lib/libc/resolv/res_update.c @@ -32,9 +32,9 @@ __FBSDID("$FreeBSD$"); #include "port_before.h" -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -49,9 +49,6 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> -#ifdef __rtems__ -#include <isc/print.h> -#endif #include <isc/list.h> #include <resolv.h> diff --git a/freebsd/lib/libc/stdio/local.h b/freebsd/lib/libc/stdio/local.h index 986e8994..d1f4bdad 100644 --- a/freebsd/lib/libc/stdio/local.h +++ b/freebsd/lib/libc/stdio/local.h @@ -33,7 +33,7 @@ * $FreeBSD$ */ -#include <sys/types.h> /* for off_t */ +#include <rtems/bsd/sys/types.h> /* for off_t */ #include <pthread.h> #include <string.h> #include <wchar.h> diff --git a/freebsd/lib/libipsec/ipsec_dump_policy.c b/freebsd/lib/libipsec/ipsec_dump_policy.c index 80cad7a0..c80fd04d 100644 --- a/freebsd/lib/libipsec/ipsec_dump_policy.c +++ b/freebsd/lib/libipsec/ipsec_dump_policy.c @@ -32,19 +32,13 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#ifdef __rtems__ -#include <freebsd/netipsec/key_var.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netipsec/ipsec.h> -#else #include <netipsec/key_var.h> #include <netinet/in.h> #include <netipsec/ipsec.h> -#endif #include <arpa/inet.h> diff --git a/freebsd/lib/libipsec/ipsec_get_policylen.c b/freebsd/lib/libipsec/ipsec_get_policylen.c index d2d47980..56f19ab6 100644 --- a/freebsd/lib/libipsec/ipsec_get_policylen.c +++ b/freebsd/lib/libipsec/ipsec_get_policylen.c @@ -32,18 +32,12 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> -#ifdef __rtems__ -#include <freebsd/netipsec/ipsec.h> - -#include <freebsd/net/pfkeyv2.h> -#else #include <netipsec/ipsec.h> #include <net/pfkeyv2.h> -#endif #include "ipsec_strerror.h" int diff --git a/freebsd/lib/libipsec/ipsec_strerror.c b/freebsd/lib/libipsec/ipsec_strerror.c index b51893eb..ca1176d3 100644 --- a/freebsd/lib/libipsec/ipsec_strerror.c +++ b/freebsd/lib/libipsec/ipsec_strerror.c @@ -32,15 +32,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <string.h> -#ifdef __rtems__ -#include <freebsd/netipsec/ipsec.h> -#else #include <netipsec/ipsec.h> -#endif #include "ipsec_strerror.h" diff --git a/freebsd/lib/libipsec/pfkey.c b/freebsd/lib/libipsec/pfkey.c index 0bcea66d..0c914962 100644 --- a/freebsd/lib/libipsec/pfkey.c +++ b/freebsd/lib/libipsec/pfkey.c @@ -32,20 +32,13 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> -#ifdef __rtems__ -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/key_var.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netipsec/ipsec.h> -#else #include <net/pfkeyv2.h> #include <netipsec/key_var.h> #include <netinet/in.h> #include <netipsec/ipsec.h> -#endif #include <stdlib.h> #include <unistd.h> diff --git a/freebsd/lib/libipsec/pfkey_dump.c b/freebsd/lib/libipsec/pfkey_dump.c index 5d83d224..f6592ae4 100644 --- a/freebsd/lib/libipsec/pfkey_dump.c +++ b/freebsd/lib/libipsec/pfkey_dump.c @@ -32,27 +32,15 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> -#include <sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #include <sys/socket.h> - -#ifdef __rtems__ -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/key_var.h> -#include <freebsd/netipsec/key_debug.h> - -#include <freebsd/netinet/in.h> -#else #include <netipsec/ipsec.h> #include <net/pfkeyv2.h> #include <netipsec/key_var.h> #include <netipsec/key_debug.h> #include <netinet/in.h> -#endif - -#include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> diff --git a/freebsd/lib/libipsec/policy_parse.y b/freebsd/lib/libipsec/policy_parse.y index 9e290f41..9e2f979c 100644 --- a/freebsd/lib/libipsec/policy_parse.y +++ b/freebsd/lib/libipsec/policy_parse.y @@ -57,11 +57,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <netinet/in.h> -#ifdef __rtems__ -#include <freebsd/netipsec/ipsec.h> -#else #include <netipsec/ipsec.h> -#endif #include <stdlib.h> #include <stdio.h> diff --git a/freebsd/lib/libipsec/policy_token.l b/freebsd/lib/libipsec/policy_token.l index d28ea727..d4167a4f 100644 --- a/freebsd/lib/libipsec/policy_token.l +++ b/freebsd/lib/libipsec/policy_token.l @@ -35,17 +35,10 @@ #include <sys/param.h> #include <sys/socket.h> #include <net/route.h> -#ifdef __rtems__ -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/keydb.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netipsec/ipsec.h> -#else #include <net/pfkeyv2.h> #include <netipsec/keydb.h> #include <netinet/in.h> #include <netipsec/ipsec.h> -#endif #include <stdlib.h> #include <limits.h> @@ -55,7 +48,7 @@ #ifdef __rtems__ /* XXX - Jennifer doesn't know where to get this from */ -YY_BUFFER_STATE yy_current_buffer; +static YY_BUFFER_STATE yy_current_buffer; #endif #include "y.tab.h" diff --git a/freebsd/lib/libkvm/kvm.h b/freebsd/lib/libkvm/kvm.h index 0427bd1c..d2132638 100644 --- a/freebsd/lib/libkvm/kvm.h +++ b/freebsd/lib/libkvm/kvm.h @@ -34,7 +34,7 @@ #define _KVM_H_ #include <sys/cdefs.h> -#include <sys/_types.h> +#include <rtems/bsd/sys/types.h> #include <nlist.h> /* Default version symbol. */ diff --git a/freebsd/lib/libmemstat/memstat.c b/freebsd/lib/libmemstat/memstat.c index 28e48138..ec23d294 100644 --- a/freebsd/lib/libmemstat/memstat.c +++ b/freebsd/lib/libmemstat/memstat.c @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/sysctl.h> #include <err.h> diff --git a/freebsd/lib/libmemstat/memstat.h b/freebsd/lib/libmemstat/memstat.h index 5991a8f2..aaa85702 100644 --- a/freebsd/lib/libmemstat/memstat.h +++ b/freebsd/lib/libmemstat/memstat.h @@ -29,10 +29,6 @@ #ifndef _MEMSTAT_H_ #define _MEMSTAT_H_ -#ifdef __rtems__ -#include <stdint.h> -#endif - /* * Number of CPU slots in library-internal data structures. This should be * at least the value of MAXCPU from param.h. diff --git a/freebsd/lib/libmemstat/memstat_all.c b/freebsd/lib/libmemstat/memstat_all.c index a943e653..ec4313e9 100644 --- a/freebsd/lib/libmemstat/memstat_all.c +++ b/freebsd/lib/libmemstat/memstat_all.c @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <sys/queue.h> #include "memstat.h" diff --git a/freebsd/lib/libmemstat/memstat_malloc.c b/freebsd/lib/libmemstat/memstat_malloc.c index 96ff8a16..6cae8f76 100644 --- a/freebsd/lib/libmemstat/memstat_malloc.c +++ b/freebsd/lib/libmemstat/memstat_malloc.c @@ -28,12 +28,8 @@ */ #include <sys/cdefs.h> -#include <sys/param.h> -#ifdef __rtems__ -#include <freebsd/sys/malloc.h> -#else +#include <rtems/bsd/sys/param.h> #include <sys/malloc.h> -#endif #include <sys/sysctl.h> #include <err.h> diff --git a/freebsd/lib/libmemstat/memstat_uma.c b/freebsd/lib/libmemstat/memstat_uma.c index deac50d7..6000a486 100644 --- a/freebsd/lib/libmemstat/memstat_uma.c +++ b/freebsd/lib/libmemstat/memstat_uma.c @@ -27,23 +27,15 @@ * $FreeBSD$ */ -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <sys/sysctl.h> #define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */ -#ifdef __rtems__ -#include <freebsd/sys/types.h> -#include <freebsd/vm/vm.h> -// #include <vm/vm_page.h> -#include <freebsd/vm/uma.h> -#include <freebsd/vm/uma_int.h> -#else #include <vm/vm.h> #include <vm/vm_page.h> + #include <vm/uma.h> #include <vm/uma_int.h> -#endif - #include <err.h> #include <errno.h> diff --git a/freebsd/lib/libutil/expand_number.c b/freebsd/lib/libutil/expand_number.c index 4c8d6f5b..6047bba5 100644 --- a/freebsd/lib/libutil/expand_number.c +++ b/freebsd/lib/libutil/expand_number.c @@ -28,7 +28,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <ctype.h> #include <errno.h> #include <inttypes.h> diff --git a/freebsd/lib/libutil/humanize_number.c b/freebsd/lib/libutil/humanize_number.c index de985870..e58668b7 100644 --- a/freebsd/lib/libutil/humanize_number.c +++ b/freebsd/lib/libutil/humanize_number.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <rtems/bsd/sys/types.h> #include <assert.h> #include <inttypes.h> #include <stdio.h> diff --git a/freebsd/lib/libutil/trimdomain.c b/freebsd/lib/libutil/trimdomain.c index 7ca6ab69..67d835f2 100644 --- a/freebsd/lib/libutil/trimdomain.c +++ b/freebsd/lib/libutil/trimdomain.c @@ -1,6 +1,3 @@ -#ifdef __rtems__ -#include "port_before.h" -#endif /*- * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org> * Based on original work by Atsushi Murai <amurai@FreeBSD.org> @@ -32,7 +29,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> +#include <rtems/bsd/sys/param.h> #include <libutil.h> #include <string.h> |