From 8635dec1a5ecd0bc18ea7d175b5edcd7ef622b6c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 15 Oct 2013 17:38:32 +0000 Subject: [PATCH] 2013-10-10 Sebastian Huber * 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/ChangeLog | 7 +++++++ newlib/libc/include/sys/_types.h | 5 ----- newlib/libc/sys/rtems/include/limits.h | 1 + newlib/libc/sys/rtems/machine/_types.h | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 7c87abe00..2a3b93652 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -5,6 +5,13 @@ * libc/include/sys/_types.h (__dev_t): Delete RTEMS specific definition. +2013-10-10 Sebastian Huber + + * libc/sys/rtems/machine/_types.h (__dev_t): Define. + (__dev_t_defined) Likewise. + * libc/include/sys/_types.h (__dev_t): Delete RTEMS specific + definition. + 2013-10-10 Sebastian Huber * libc/sys/rtems/machine/_types.h (_ssize_t): Delete. diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h index e8ac429e7..07bc27675 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/include/limits.h b/newlib/libc/sys/rtems/include/limits.h index 43ede04e6..25a47b2b1 100644 --- a/newlib/libc/sys/rtems/include/limits.h +++ b/newlib/libc/sys/rtems/include/limits.h @@ -32,6 +32,7 @@ #define _POSIX_ARG_MAX 4096 #define _POSIX_CHILD_MAX 6 #define _POSIX_DELAYTIMER_MAX 32 +#define _POSIX_HOST_NAME_MAX 255 #define _POSIX_LINK_MAX 8 #define _POSIX_MAX_CANON 255 #define _POSIX_MAX_INPUT 255 diff --git a/newlib/libc/sys/rtems/machine/_types.h b/newlib/libc/sys/rtems/machine/_types.h index 565dc1a0c..e0d93f7fe 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;