diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-24 14:46:25 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 13:18:51 +0100 |
| commit | 11b7f58408f1532303eb64ce71a1307f81665f9b (patch) | |
| tree | 7e49d2412a387f4a0702962b6a329bcface3f835 /freebsd/sys/netinet6 | |
| parent | Remove includes in <machine/rtems-bsd-config.h> (diff) | |
| download | rtems-libbsd-11b7f58408f1532303eb64ce71a1307f81665f9b.tar.bz2 | |
Fix errno conflict
Newlib defines errno as
#define errno (*__errno())
In case this is expanded in a function parameter, e.g.
void f(int errno) { ... }
then we have a function pointer parameter instead of the integer scalar.
Diffstat (limited to 'freebsd/sys/netinet6')
| -rw-r--r-- | freebsd/sys/netinet6/in6_pcb.c | 4 | ||||
| -rw-r--r-- | freebsd/sys/netinet6/in6_pcb.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/freebsd/sys/netinet6/in6_pcb.c b/freebsd/sys/netinet6/in6_pcb.c index 09b05f5a..4a1f65c5 100644 --- a/freebsd/sys/netinet6/in6_pcb.c +++ b/freebsd/sys/netinet6/in6_pcb.c @@ -62,6 +62,10 @@ * @(#)in_pcb.c 8.2 (Berkeley) 1/4/94 */ +#ifdef __rtems__ +#include <errno.h> +#undef errno +#endif /* __rtems__ */ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/freebsd/sys/netinet6/in6_pcb.h b/freebsd/sys/netinet6/in6_pcb.h index 6ea63903..c54a8cf3 100644 --- a/freebsd/sys/netinet6/in6_pcb.h +++ b/freebsd/sys/netinet6/in6_pcb.h @@ -86,13 +86,8 @@ struct inpcb * void in6_pcbnotify __P((struct inpcbinfo *, struct sockaddr *, u_int, const struct sockaddr *, u_int, int, void *, struct inpcb *(*)(struct inpcb *, int))); -#ifndef __rtems__ struct inpcb * in6_rtchange __P((struct inpcb *, int)); -#else -struct inpcb * - in6_rtchange(struct inpcb *inp, int errno); -#endif struct sockaddr * in6_sockaddr __P((in_port_t port, struct in6_addr *addr_p)); struct sockaddr * |