summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-08 14:38:12 -0800
committerSteve Kondik <shade@chemlab.org>2014-09-02 05:10:37 +0000
commita6ec766e03030feb1c3fbb0579e30419c26361c5 (patch)
tree06969cff0e3a124b3187542c2178f8390b37f7c4
parentedb901356a0cf5015dd2c96cec22eaf6776d3e12 (diff)
downloadbionic-a6ec766e03030feb1c3fbb0579e30419c26361c5.zip
bionic-a6ec766e03030feb1c3fbb0579e30419c26361c5.tar.gz
bionic-a6ec766e03030feb1c3fbb0579e30419c26361c5.tar.bz2
Remove the dependency on the non-uapi __kernel_nlink_t.
The kernel doesn't have an nlink_t; it just uses the equivalent of uint32_t. We already had a usable __nlink_t in the C library, so let's just define our nlink_t in terms of __nlink_t, which is what __nlink_t was meant for anyway. Note that our struct stat just follows the kernel, and doesn't refer to nlink_t anyway. Change-Id: I6f51188d188fab975e286d6f8945fe746200b8d4
-rw-r--r--libc/include/sys/types.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h
index a0ce405..bee1329 100644
--- a/libc/include/sys/types.h
+++ b/libc/include/sys/types.h
@@ -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; /* GLibc-specific */
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