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/libipsec | |
| 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/libipsec')
| -rw-r--r-- | freebsd/lib/libipsec/ipsec_dump_policy.c | 10 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/ipsec_get_policylen.c | 10 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/ipsec_strerror.c | 8 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/pfkey.c | 11 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/pfkey_dump.c | 16 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/policy_parse.y | 4 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/policy_token.l | 9 |
7 files changed, 11 insertions, 57 deletions
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" |