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

am e9664fea: am 5b6290bc: am ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."

Browse Source 
* commit 'e9664fea54d21f765c906006db27b8e275c4a198':
  Remove the dependency on the non-uapi __kernel_nlink_t.
This commit is contained in:
Elliott Hughes 2013-11-08 16:03:51 -08:00 committed by Android Git Automerger
commit 41392e2802
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ typedef __kernel_id_t id_t;
typedef __kernel_ino_t ino_t; typedef __kernel_ino_t ino_t;
typedef __kernel_key_t key_t; typedef __kernel_key_t key_t;
typedef __kernel_mode_t mode_t; typedef __kernel_mode_t mode_t;
typedef __kernel_nlink_t nlink_t;
#ifndef _OFF_T_DEFINED_ #ifndef _OFF_T_DEFINED_
#define _OFF_T_DEFINED_ #define _OFF_T_DEFINED_
typedef __kernel_off_t off_t; typedef __kernel_off_t off_t;
@ -69,6 +68,8 @@ typedef loff_t off64_t;
typedef __kernel_pid_t pid_t; typedef __kernel_pid_t pid_t;
typedef __nlink_t nlink_t;
/* while POSIX wants these in <sys/types.h>, we /* while POSIX wants these in <sys/types.h>, we
* declare then in <pthread.h> instead */ * declare then in <pthread.h> instead */
#if 0 #if 0