diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2011-08-05 00:12:36 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2011-08-05 00:12:36 +0000 |
| commit | af30847a8b37476044817b9ff1653a7ee2b9c779 (patch) | |
| tree | af045e83cefaee80c6331569130f52e18d4dbf94 /bsd_eth_drivers/libbsdport | |
| parent | 2011-07-21 Till Straumann <Till.Straumann@TU-Berlin.de> (diff) | |
| download | libbsdport-af30847a8b37476044817b9ff1653a7ee2b9c779.tar.bz2 | |
2011-08-04 Till Straumann <Till.Straumann@TU-Berlin.de>
* libbsdport/devicet.h, libbsdport/ifmedia.c: rtems-4.11 moved
<queue.h>, and <cdefs.h> to newlib. Added a version-test macro
to catch this case.
Diffstat (limited to 'bsd_eth_drivers/libbsdport')
| -rw-r--r-- | bsd_eth_drivers/libbsdport/Makefile.am | 2 | ||||
| -rw-r--r-- | bsd_eth_drivers/libbsdport/devicet.h | 2 | ||||
| -rw-r--r-- | bsd_eth_drivers/libbsdport/ifmedia.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/bsd_eth_drivers/libbsdport/Makefile.am b/bsd_eth_drivers/libbsdport/Makefile.am index 06c70c8..4596cd6 100644 --- a/bsd_eth_drivers/libbsdport/Makefile.am +++ b/bsd_eth_drivers/libbsdport/Makefile.am @@ -22,6 +22,8 @@ LINKS+=sys/taskqueue.h LINKS+=sys/bus.h LINKS+=sys/mutex.h LINKS+=bsp/rtems_verscheck.h +#LINKS+=rtems/bsd/sys/queue.h +#LINKS+=rtems/bsd/sys/cdefs.h DUMMYHEADERS = DUMMYHEADERS+=dummyheaders/machine/bus.h diff --git a/bsd_eth_drivers/libbsdport/devicet.h b/bsd_eth_drivers/libbsdport/devicet.h index bbb4e71..090620e 100644 --- a/bsd_eth_drivers/libbsdport/devicet.h +++ b/bsd_eth_drivers/libbsdport/devicet.h @@ -8,7 +8,7 @@ #include <bsp/rtems_verscheck.h> -#if RTEMS_REV_AT_LEAST(4,8,99) +#if RTEMS_REV_AT_LEAST(4,8,99) && !RTEMS_REV_AT_LEAST(4,10,99) #include <rtems/bsd/sys/queue.h> #else #include <sys/queue.h> diff --git a/bsd_eth_drivers/libbsdport/ifmedia.c b/bsd_eth_drivers/libbsdport/ifmedia.c index dc85dfd..cd7ebc0 100644 --- a/bsd_eth_drivers/libbsdport/ifmedia.c +++ b/bsd_eth_drivers/libbsdport/ifmedia.c @@ -5,7 +5,7 @@ #include <bsp/rtems_verscheck.h> -#if RTEMS_REV_AT_LEAST(4,8,99) +#if RTEMS_REV_AT_LEAST(4,8,99) && !RTEMS_REV_AT_LEAST(4,10,99) #include <rtems/bsd/sys/queue.h> #else #include <sys/queue.h> |