From 50eb944a7cb0cb6f9b004569127870bcb0dbca4e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Tue, 15 Oct 2013 17:39:19 +0000
Subject: [PATCH] 2013-10-10  Sebastian Huber
 <sebastian.huber@embedded-brains.de>

	* libc/sys/rtems/machine/_types.h (_HAVE_SYSTYPES): Define.
---
 newlib/ChangeLog                       | 4 ++++
 newlib/libc/sys/rtems/machine/_types.h | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2a3b93652..e59e7c243 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-10  Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* libc/sys/rtems/machine/_types.h (_HAVE_SYSTYPES): Define.
+
 2013-10-10  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* libc/sys/rtems/machine/_types.h (__dev_t): Define.
diff --git a/newlib/libc/sys/rtems/machine/_types.h b/newlib/libc/sys/rtems/machine/_types.h
index e0d93f7fe..1711c7ae8 100644
--- a/newlib/libc/sys/rtems/machine/_types.h
+++ b/newlib/libc/sys/rtems/machine/_types.h
@@ -5,6 +5,9 @@
 #ifndef _MACHINE__TYPES_H
 #define _MACHINE__TYPES_H
 
+/* This disables some conflicting type definitions in <machine/types.h> */
+#define _HAVE_SYSTYPES
+
 #include <machine/_default_types.h>
 
 typedef __int32_t blksize_t;