From af30847a8b37476044817b9ff1653a7ee2b9c779 Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Fri, 5 Aug 2011 00:12:36 +0000
Subject: 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.
---
 bsd_eth_drivers/ChangeLog              | 6 ++++++
 bsd_eth_drivers/libbsdport/Makefile.am | 2 ++
 bsd_eth_drivers/libbsdport/devicet.h   | 2 +-
 bsd_eth_drivers/libbsdport/ifmedia.c   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bsd_eth_drivers/ChangeLog b/bsd_eth_drivers/ChangeLog
index 46fb31e..9dca162 100644
--- a/bsd_eth_drivers/ChangeLog
+++ b/bsd_eth_drivers/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2011-07-21 Till Straumann <Till.Straumann@TU-Berlin.de>
 
 	* if_em/e1000_osdep.h, if_em/e1000_osdep.c, if_em/if_em.c:
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>
-- 
cgit v1.2.3