patch-1.3.79 linux/include/linux/types.h
Next file: linux/kernel/ksyms.c
Previous file: linux/include/linux/posix_types.h
Back to the patch index
Back to the overall index
- Lines: 120
- Date:
Tue Mar 26 16:59:30 1996
- Orig file:
v1.3.78/linux/include/linux/types.h
- Orig date:
Mon Mar 25 10:22:30 1996
diff -u --recursive --new-file v1.3.78/linux/include/linux/types.h linux/include/linux/types.h
@@ -6,23 +6,20 @@
#ifndef _LINUX_TYPES_DONT_EXPORT
-typedef __fd_set fd_set;
-typedef __dev_t dev_t;
-typedef __ino_t ino_t;
-typedef __mode_t mode_t;
-typedef __nlink_t nlink_t;
-typedef __off_t off_t;
-typedef __pid_t pid_t;
-typedef __uid_t uid_t;
-typedef __gid_t gid_t;
-typedef __daddr_t daddr_t;
+typedef __kernel_fd_set fd_set;
+typedef __kernel_dev_t dev_t;
+typedef __kernel_ino_t ino_t;
+typedef __kernel_mode_t mode_t;
+typedef __kernel_nlink_t nlink_t;
+typedef __kernel_off_t off_t;
+typedef __kernel_pid_t pid_t;
+typedef __kernel_uid_t uid_t;
+typedef __kernel_gid_t gid_t;
+typedef __kernel_daddr_t daddr_t;
-/* bsd */
-
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+typedef __kernel_loff_t loff_t;
+#endif
/*
* The following typedefs are also protected by individual ifdefs for
@@ -30,39 +27,45 @@
*/
#ifndef _SIZE_T
#define _SIZE_T
-typedef __size_t size_t;
+typedef __kernel_size_t size_t;
#endif
#ifndef _SSIZE_T
#define _SSIZE_T
-typedef __ssize_t ssize_t;
+typedef __kernel_ssize_t ssize_t;
#endif
#ifndef _PTRDIFF_T
#define _PTRDIFF_T
-typedef __ptrdiff_t ptrdiff_t;
+typedef __kernel_ptrdiff_t ptrdiff_t;
#endif
#ifndef _TIME_T
#define _TIME_T
-typedef __time_t time_t;
+typedef __kernel_time_t time_t;
#endif
#ifndef _CLOCK_T
#define _CLOCK_T
-typedef __clock_t clock_t;
+typedef __kernel_clock_t clock_t;
#endif
#ifndef _CADDR_T
#define _CADDR_T
-typedef __caddr_t caddr_t;
+typedef __kernel_caddr_t caddr_t;
#endif
+/* bsd */
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+typedef unsigned int u_int;
+typedef unsigned long u_long;
+
/* sysv */
-typedef unsigned char unchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-typedef unsigned long ulong;
+typedef unsigned char unchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+typedef unsigned long ulong;
#endif /* _LINUX_TYPES_DONT_EXPORT */
@@ -71,22 +74,11 @@
* any application/library that wants linux/types.h.
*/
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-
-typedef long long __loff_t;
-
-#ifndef _LINUX_TYPES_DONT_EXPORT
-#define _LOFF_T
-typedef __loff_t loff_t;
-#endif
-
-#endif
-
struct ustat {
- __daddr_t f_tfree;
- __ino_t f_tinode;
- char f_fname[6];
- char f_fpack[6];
+ __kernel_daddr_t f_tfree;
+ __kernel_ino_t f_tinode;
+ char f_fname[6];
+ char f_fpack[6];
};
#endif /* _LINUX_TYPES_H */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this