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;
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;
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
--- /dev/null
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <sys/types.h>
+
+TEST(sys_types, type_sizes) {
+ // gids, pids, and uids should be 32-bit on all systems.
+ ASSERT_EQ(4U, sizeof(gid_t));
+ ASSERT_EQ(4U, sizeof(pid_t));
+ ASSERT_EQ(4U, sizeof(uid_t));
+ // id_t is the 'generic'.
+ ASSERT_EQ(4U, sizeof(id_t));
+
+ // Some types were too small on 32-bit Android by mistake,
+ // but are correct on 64-bit Android.
+#if defined(__LP64__)
+ ASSERT_EQ(8U, sizeof(dev_t));
+ ASSERT_EQ(8U, sizeof(off_t));
+ ASSERT_EQ(8U, sizeof(time_t));
+#else
+ ASSERT_EQ(4U, sizeof(dev_t));
+ ASSERT_EQ(4U, sizeof(off_t));
+ ASSERT_EQ(4U, sizeof(time_t));
+#endif
+ // These were right even on 32-bit Android.
+ ASSERT_EQ(8U, sizeof(loff_t));
+ ASSERT_EQ(8U, sizeof(off64_t));
+}