mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
remove __KERNEL_STRICT_NAMES
With the last used of non-strict names gone from the exported header files, we can remove the old libc5 compatibility cruft from our headers and only export strict types. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
60c195c729
commit
3a471cbc08
@ -1,8 +1,9 @@
|
|||||||
#ifndef _GENERIC_STATFS_H
|
#ifndef _GENERIC_STATFS_H
|
||||||
#define _GENERIC_STATFS_H
|
#define _GENERIC_STATFS_H
|
||||||
|
|
||||||
#ifndef __KERNEL_STRICT_NAMES
|
#include <linux/types.h>
|
||||||
# include <linux/types.h>
|
|
||||||
|
#ifdef __KERNEL__
|
||||||
typedef __kernel_fsid_t fsid_t;
|
typedef __kernel_fsid_t fsid_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#include <linux/posix_types.h>
|
#include <linux/posix_types.h>
|
||||||
|
|
||||||
#ifndef __KERNEL_STRICT_NAMES
|
#ifdef __KERNEL__
|
||||||
|
|
||||||
typedef __u32 __kernel_dev_t;
|
typedef __u32 __kernel_dev_t;
|
||||||
|
|
||||||
@ -31,7 +31,6 @@ typedef __kernel_timer_t timer_t;
|
|||||||
typedef __kernel_clockid_t clockid_t;
|
typedef __kernel_clockid_t clockid_t;
|
||||||
typedef __kernel_mqd_t mqd_t;
|
typedef __kernel_mqd_t mqd_t;
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
|
||||||
typedef _Bool bool;
|
typedef _Bool bool;
|
||||||
|
|
||||||
typedef __kernel_uid32_t uid_t;
|
typedef __kernel_uid32_t uid_t;
|
||||||
@ -47,14 +46,6 @@ typedef __kernel_old_uid_t old_uid_t;
|
|||||||
typedef __kernel_old_gid_t old_gid_t;
|
typedef __kernel_old_gid_t old_gid_t;
|
||||||
#endif /* CONFIG_UID16 */
|
#endif /* CONFIG_UID16 */
|
||||||
|
|
||||||
/* libc5 includes this file to define uid_t, thus uid_t can never change
|
|
||||||
* when it is included by non-kernel code
|
|
||||||
*/
|
|
||||||
#else
|
|
||||||
typedef __kernel_uid_t uid_t;
|
|
||||||
typedef __kernel_gid_t gid_t;
|
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
typedef __kernel_loff_t loff_t;
|
typedef __kernel_loff_t loff_t;
|
||||||
#endif
|
#endif
|
||||||
@ -156,7 +147,7 @@ typedef unsigned long blkcnt_t;
|
|||||||
#define pgoff_t unsigned long
|
#define pgoff_t unsigned long
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __KERNEL_STRICT_NAMES */
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Below are truly Linux-specific types that should never collide with
|
* Below are truly Linux-specific types that should never collide with
|
||||||
|
Loading…
Reference in New Issue
Block a user