generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 30ef1f3e: am ca63af9e: am b235f8c8: Merge "Fix dev_t (for LP64)."

Browse Source 
* commit '30ef1f3e35e8c473b56cefa85617b660fa3a15fb':
  Fix dev_t (for LP64).
This commit is contained in:
Elliott Hughes
2014-01-06 20:56:51 +00:00
committed by Android Git Automerger
parent 6d3183bc40 30ef1f3e35
commit 9555fa7ec0
4 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/include/sys/_types.h
View File

@@ -37,7 +37,6 @@
#include <machine/_types.h>
typedef unsigned long __cpuid_t; /* CPU id */
typedef __int32_t __dev_t; /* device number */
typedef __uint32_t __fixpt_t; /* fixed point number */
typedef __uint32_t __gid_t; /* group id */
typedef __uint32_t __id_t; /* may contain pid, uid or gid */

12
libc/include/sys/types.h
View File

@@ -47,10 +47,8 @@ typedef __kernel_caddr_t caddr_t;
typedef __kernel_clock_t clock_t;
typedef __kernel_clockid_t clockid_t;
typedef __kernel_daddr_t daddr_t;
typedef uint32_t dev_t;
typedef unsigned long fsblkcnt_t;
typedef unsigned long fsfilcnt_t;
typedef uint32_t id_t;
typedef __kernel_ino_t ino_t;
typedef __kernel_key_t key_t;
typedef __kernel_mode_t mode_t;
@@ -60,6 +58,13 @@ typedef __kernel_suseconds_t suseconds_t;
typedef __kernel_timer_t timer_t;
typedef unsigned int useconds_t;
#if !defined(__LP64__)
/* This historical accident means that we had a 32-bit dev_t on 32-bit architectures. */
typedef uint32_t dev_t;
#else
typedef uint64_t dev_t;
#endif
/* This historical accident means that we had a 32-bit time_t on 32-bit architectures. */
typedef __kernel_time_t time_t;
@@ -71,6 +76,9 @@ typedef __kernel_off_t off_t;
typedef __kernel_loff_t loff_t;
typedef loff_t off64_t;
/* This one really is meant to be just 32 bits! */
typedef uint32_t id_t;
/* while POSIX wants these in <sys/types.h>, we
* declare then in <pthread.h> instead */
#if 0