diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2009-10-20 23:46:58 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2009-10-20 23:46:58 +0000 |
| commit | 4610a13b765dcf1ee612334de2922e5d5bfb0d9c (patch) | |
| tree | 00ce21917217a28832940213b28ac28c9536ecd4 | |
| parent | b0125716e760ee28cf5c15af3dd5f1ead97e1158 (diff) | |
2009-10-20 Till Straumann <Till.Straumann@TU-Berlin.de>
* libbsdport/libbsdport.h, if_em/e1000_osdep.h:
We need __BSD_VISIBLE defined. Some things in the rtems headers
changed with 4.10 (can't pinpoint the details). We now
#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ before explicitly
including <rtems/rtems_bsdnet.h> and this seemed to fix
things for 4.10.
| -rw-r--r-- | bsd_eth_drivers/ChangeLog | 9 | ||||
| -rw-r--r-- | bsd_eth_drivers/if_em/e1000_osdep.h | 4 | ||||
| -rw-r--r-- | bsd_eth_drivers/libbsdport/libbsdport.h | 7 |
3 files changed, 19 insertions, 1 deletions
diff --git a/bsd_eth_drivers/ChangeLog b/bsd_eth_drivers/ChangeLog index d0b2992..6409324 100644 --- a/bsd_eth_drivers/ChangeLog +++ b/bsd_eth_drivers/ChangeLog @@ -1,5 +1,14 @@ 2009-10-20 Till Straumann <Till.Straumann@TU-Berlin.de> + * libbsdport/libbsdport.h, if_em/e1000_osdep.h: + We need __BSD_VISIBLE defined. Some things in the rtems headers + changed with 4.10 (can't pinpoint the details). We now + #define __INSIDE_RTEMS_BSD_TCPIP_STACK__ before explicitly + including <rtems/rtems_bsdnet.h> and this seemed to fix + things for 4.10. + +2009-10-20 Till Straumann <Till.Straumann@TU-Berlin.de> + * libbsdport/libbsdport_post.h: added missing declaration of m_defrag() (Chris replaced the dummy #define a while ago and provided an implementation instead [thanks!] but diff --git a/bsd_eth_drivers/if_em/e1000_osdep.h b/bsd_eth_drivers/if_em/e1000_osdep.h index 447bdff..96a7d84 100644 --- a/bsd_eth_drivers/if_em/e1000_osdep.h +++ b/bsd_eth_drivers/if_em/e1000_osdep.h @@ -42,6 +42,10 @@ POSSIBILITY OF SUCH DAMAGE. #include <vm/vm.h> /* for non-_KERNEL boolean_t :-( */ #ifdef _KERNEL +#ifndef __INSIDE_RTEMS_BSD_TCPIP_STACK__ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ +#endif +#include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet_internal.h> #include <sys/types.h> diff --git a/bsd_eth_drivers/libbsdport/libbsdport.h b/bsd_eth_drivers/libbsdport/libbsdport.h index de6eb9b..24d8da7 100644 --- a/bsd_eth_drivers/libbsdport/libbsdport.h +++ b/bsd_eth_drivers/libbsdport/libbsdport.h @@ -2,14 +2,19 @@ #define RTEMS_COMPAT_DEFS_H #include <rtems.h> -#include <sys/param.h> #ifndef _KERNEL #define _KERNEL #endif +#ifndef __INSIDE_RTEMS_BSD_TCPIP_STACK__ +#define __INSIDE_RTEMS_BSD_TCPIP_STACK__ +#endif + #include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet_internal.h> +#include <sys/param.h> + #include <inttypes.h> #include <string.h> |