This is the mail archive of the
newlib@sourceware.org
mailing list for the newlib project.
[PATCH 4/7] Avoid RTEMS specifics in <sys/_types.h>
- From: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- To: newlib at sourceware dot org
- Cc: Sebastian Huber <sebastian dot huber at embedded-brains dot de>
- Date: Tue, 8 Oct 2013 14:45:42 +0200
- Subject: [PATCH 4/7] Avoid RTEMS specifics in <sys/_types.h>
- Authentication-results: sourceware.org; auth=none
- References: <1381236345-11031-1-git-send-email-sebastian dot huber at embedded-brains dot de>
newlib/ChangeLog
2013-10-08 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libc/sys/rtems/machine/_types.h (__dev_t): Define.
(__dev_t_defined) Likewise.
* libc/include/sys/_types.h (__dev_t): Delete RTEMS specific
definition.
---
newlib/libc/include/sys/_types.h | 5 -----
newlib/libc/sys/rtems/machine/_types.h | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index e8ac429..07bc276 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -16,14 +16,9 @@
typedef long _off_t;
#endif
-#if defined(__rtems__)
-/* device numbers are 32-bit major and and 32-bit minor */
-typedef unsigned long long __dev_t;
-#else
#ifndef __dev_t_defined
typedef short __dev_t;
#endif
-#endif
#ifndef __uid_t_defined
typedef unsigned short __uid_t;
diff --git a/newlib/libc/sys/rtems/machine/_types.h b/newlib/libc/sys/rtems/machine/_types.h
index 565dc1a..e0d93f7 100644
--- a/newlib/libc/sys/rtems/machine/_types.h
+++ b/newlib/libc/sys/rtems/machine/_types.h
@@ -10,6 +10,9 @@
typedef __int32_t blksize_t;
typedef __int32_t blkcnt_t;
+typedef __uint64_t __dev_t;
+#define __dev_t_defined 1
+
#if defined(__arm__) || defined(__i386__) || defined(__m68k__) || defined(__mips__) || defined(__PPC__) || defined(__sparc__)
/* Use 64bit types */
typedef __int64_t _off_t;
--
1.7.7