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

* commit '5b6290bcfb47ffb27a66450c9cc3258021e259fa':
  Remove the dependency on the non-uapi __kernel_nlink_t.
This commit is contained in:
Elliott Hughes 2013-11-08 15:17:19 -08:00 committed by Android Git Automerger
commit e9664fea54

View File

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