summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-08-18 21:08:34 +0000
committerEric Andersen <andersen@codepoet.org>2002-08-18 21:08:34 +0000
commit175f6f670de99b6aa0e866df24a792444586ff0d (patch)
treef719a202f9ec3b6b22fe4ace2df5531881e135a6
parent160212fe2d074af5bdc25b219e2276576f52b6e3 (diff)
Directly use kernel types for uid_t, gid_t, and dev_t to avoid the
need to translate these entities... -Erik
-rw-r--r--libc/sysdeps/linux/alpha/bits/types.h15
-rw-r--r--libc/sysdeps/linux/common/bits/types.h15
-rw-r--r--libc/sysdeps/linux/mips/bits/types.h17
-rw-r--r--libc/sysdeps/linux/powerpc/bits/types.h15
-rw-r--r--libc/sysdeps/linux/sparc/bits/types.h15
5 files changed, 60 insertions, 17 deletions
diff --git a/libc/sysdeps/linux/alpha/bits/types.h b/libc/sysdeps/linux/alpha/bits/types.h
index 1b809e235..569e5a81a 100644
--- a/libc/sysdeps/linux/alpha/bits/types.h
+++ b/libc/sysdeps/linux/alpha/bits/types.h
@@ -28,6 +28,15 @@
#define __need_size_t
#include <stddef.h>
+/* Sigh. We need to carefully wrap this one... */
+#ifndef __GLIBC__
+#define __GLIBC__ 2
+#include <asm/posix_types.h>
+#undef __GLIBC__
+#else
+#include <asm/posix_types.h>
+#endif
+
/* Convenience types. */
typedef unsigned char __u_char;
typedef unsigned short int __u_short;
@@ -45,9 +54,9 @@ typedef signed long int __int64_t;
typedef unsigned long int __uint64_t;
typedef __quad_t *__qaddr_t;
-typedef __uint64_t __dev_t; /* Type of device numbers. */
-typedef __uint32_t __uid_t; /* Type of user identifications. */
-typedef __uint32_t __gid_t; /* Type of group identifications. */
+typedef __kernel_dev_t __dev_t; /* Type of device numbers. */
+typedef __kernel_uid_t __uid_t; /* Type of user identifications. */
+typedef __kernel_gid_t __gid_t; /* Type of group identifications. */
typedef __uint32_t __ino_t; /* Type of file serial numbers. */
typedef __uint64_t __ino64_t; /* "" (LFS) */
typedef __uint32_t __mode_t; /* Type of file attribute bitmasks. */
diff --git a/libc/sysdeps/linux/common/bits/types.h b/libc/sysdeps/linux/common/bits/types.h
index 839455392..88126cca3 100644
--- a/libc/sysdeps/linux/common/bits/types.h
+++ b/libc/sysdeps/linux/common/bits/types.h
@@ -28,6 +28,15 @@
#define __need_size_t
#include <stddef.h>
+/* Sigh. We need to carefully wrap this one... */
+#ifndef __GLIBC__
+#define __GLIBC__ 2
+#include <asm/posix_types.h>
+#undef __GLIBC__
+#else
+#include <asm/posix_types.h>
+#endif
+
/* Convenience types. */
typedef unsigned char __u_char;
typedef unsigned short __u_short;
@@ -58,9 +67,9 @@ __extension__ typedef unsigned long long int __uint64_t;
#endif
typedef __quad_t *__qaddr_t;
-typedef __u_quad_t __dev_t; /* Type of device numbers. */
-typedef __u_int __uid_t; /* Type of user identifications. */
-typedef __u_int __gid_t; /* Type of group identifications. */
+typedef __kernel_dev_t __dev_t; /* Type of device numbers. */
+typedef __kernel_uid_t __uid_t; /* Type of user identifications. */
+typedef __kernel_gid_t __gid_t; /* Type of group identifications. */
typedef __u_long __ino_t; /* Type of file serial numbers. */
typedef __u_int __mode_t; /* Type of file attribute bitmasks. */
typedef __u_int __nlink_t; /* Type of file link counts. */
diff --git a/libc/sysdeps/linux/mips/bits/types.h b/libc/sysdeps/linux/mips/bits/types.h
index 5ace8a8a7..8a05d1857 100644
--- a/libc/sysdeps/linux/mips/bits/types.h
+++ b/libc/sysdeps/linux/mips/bits/types.h
@@ -28,6 +28,15 @@
#define __need_size_t
#include <stddef.h>
+/* Sigh. We need to carefully wrap this one... */
+#ifndef __GLIBC__
+#define __GLIBC__ 2
+#include <asm/posix_types.h>
+#undef __GLIBC__
+#else
+#include <asm/posix_types.h>
+#endif
+
/* Convenience types. */
typedef unsigned char __u_char;
typedef unsigned short __u_short;
@@ -59,11 +68,9 @@ __extension__ typedef unsigned long long int __uint64_t;
typedef __quad_t *__qaddr_t;
/* changed to be more compatible with kernel */
-/*typedef __u_quad_t __dev_t;*/ /* Type of device numbers. */
-typedef __u_int __dev_t; /* Type of device numbers. */
-
-typedef __u_int __uid_t; /* Type of user identifications. */
-typedef __u_int __gid_t; /* Type of group identifications. */
+typedef __kernel_dev_t __dev_t; /* Type of device numbers. */
+typedef __kernel_uid_t __uid_t; /* Type of user identifications. */
+typedef __kernel_gid_t __gid_t; /* Type of group identifications. */
typedef __u_long __ino_t; /* Type of file serial numbers. */
typedef __u_int __mode_t; /* Type of file attribute bitmasks. */
typedef __u_int __nlink_t; /* Type of file link counts. */
diff --git a/libc/sysdeps/linux/powerpc/bits/types.h b/libc/sysdeps/linux/powerpc/bits/types.h
index 74358469b..144ffb32a 100644
--- a/libc/sysdeps/linux/powerpc/bits/types.h
+++ b/libc/sysdeps/linux/powerpc/bits/types.h
@@ -28,6 +28,15 @@
#define __need_size_t
#include <stddef.h>
+/* Sigh. We need to carefully wrap this one... */
+#ifndef __GLIBC__
+#define __GLIBC__ 2
+#include <asm/posix_types.h>
+#undef __GLIBC__
+#else
+#include <asm/posix_types.h>
+#endif
+
/* Convenience types. */
typedef unsigned char __u_char;
typedef unsigned short __u_short;
@@ -60,9 +69,9 @@ typedef __quad_t *__qaddr_t;
/* These types are modified from glibc to be
* more compatible with the Linux kernel. */
-typedef __u_int __dev_t; /* Type of device numbers. */
-typedef __u_int __uid_t; /* Type of user identifications. */
-typedef __u_int __gid_t; /* Type of group identifications. */
+typedef __kernel_dev_t __dev_t; /* Type of device numbers. */
+typedef __kernel_uid_t __uid_t; /* Type of user identifications. */
+typedef __kernel_gid_t __gid_t; /* Type of group identifications. */
typedef __u_int __ino_t; /* Type of file serial numbers. */
typedef __u_int __mode_t; /* Type of file attribute bitmasks. */
typedef __u_short __nlink_t; /* Type of file link counts. */
diff --git a/libc/sysdeps/linux/sparc/bits/types.h b/libc/sysdeps/linux/sparc/bits/types.h
index 0d357a930..1530931b6 100644
--- a/libc/sysdeps/linux/sparc/bits/types.h
+++ b/libc/sysdeps/linux/sparc/bits/types.h
@@ -29,6 +29,15 @@
#include <stddef.h>
#include <bits/wordsize.h>
+/* Sigh. We need to carefully wrap this one... */
+#ifndef __GLIBC__
+#define __GLIBC__ 2
+#include <asm/posix_types.h>
+#undef __GLIBC__
+#else
+#include <asm/posix_types.h>
+#endif
+
/* Convenience types. */
typedef unsigned char __u_char;
typedef unsigned short int __u_short;
@@ -69,9 +78,9 @@ __extension__ typedef unsigned long long int __uint64_t;
#endif
typedef __quad_t *__qaddr_t;
-typedef __u_quad_t __dev_t; /* Type of device numbers. */
-typedef __u_int __uid_t; /* Type of user identifications. */
-typedef __u_int __gid_t; /* Type of group identifications. */
+typedef __kernel_dev_t __dev_t; /* Type of device numbers. */
+typedef __kernel_uid_t __uid_t; /* Type of user identifications. */
+typedef __kernel_gid_t __gid_t; /* Type of group identifications. */
typedef __u_long __ino_t; /* Type of file serial numbers. */
typedef __u_quad_t __ino64_t; /* Type of file serial numbers. */
typedef __u_int __mode_t; /* Type of file attribute bitmasks. */