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/sbin/ping | |
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/sbin/ping')
-rw-r--r-- | freebsd/sbin/ping/ping.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/freebsd/sbin/ping/ping.c b/freebsd/sbin/ping/ping.c index 34d86325..96d1c793 100644 --- a/freebsd/sbin/ping/ping.c +++ b/freebsd/sbin/ping/ping.c @@ -66,32 +66,21 @@ __FBSDID("$FreeBSD$"); * This program has to run SUID to ROOT to access the ICMP socket. */ -#include <sys/param.h> /* NB: we rely on this for <sys/types.h> */ +#include <rtems/bsd/sys/param.h> /* NB: we rely on this for <sys/types.h> */ #include <sys/socket.h> #include <sys/sysctl.h> -#include <sys/time.h> +#include <rtems/bsd/sys/time.h> #include <sys/uio.h> #include <netinet/in.h> -#ifdef __rtems__ -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_icmp.h> -#include <freebsd/netinet/ip_var.h> -#else #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> -#endif #include <arpa/inet.h> #ifdef IPSEC -#ifdef __rtems__ -#include <freebsd/netipsec/ipsec.h> -#else #include <netipsec/ipsec.h> -#endif #endif /*IPSEC*/ #include <ctype.h> @@ -106,10 +95,6 @@ __FBSDID("$FreeBSD$"); #include <sysexits.h> #include <unistd.h> -#ifdef __rtems__ -#define select __select -#endif - #define INADDR_LEN ((int)sizeof(in_addr_t)) #define TIMEVAL_LEN ((int)sizeof(struct tv32)) #define MASK_LEN (ICMP_MASKLEN - ICMP_MINLEN) |