lkml.org 
[lkml]   [2009]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 7/7] 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>
    ---
    include/asm-generic/statfs.h | 5 +++--
    include/linux/types.h | 13 ++-----------
    2 files changed, 5 insertions(+), 13 deletions(-)

    diff --git a/include/asm-generic/statfs.h b/include/asm-generic/statfs.h
    index 6129d68..3b4fb3e 100644
    --- a/include/asm-generic/statfs.h
    +++ b/include/asm-generic/statfs.h
    @@ -1,8 +1,9 @@
    #ifndef _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;
    #endif

    diff --git a/include/linux/types.h b/include/linux/types.h
    index 712ca53..6508ba1 100644
    --- a/include/linux/types.h
    +++ b/include/linux/types.h
    @@ -11,7 +11,7 @@
    #include <linux/posix_types.h>
    #include <asm/types.h>

    -#ifndef __KERNEL_STRICT_NAMES
    +#ifdef __KERNEL__

    typedef __u32 __kernel_dev_t;

    @@ -29,7 +29,6 @@ typedef __kernel_timer_t timer_t;
    typedef __kernel_clockid_t clockid_t;
    typedef __kernel_mqd_t mqd_t;

    -#ifdef __KERNEL__
    typedef _Bool bool;

    typedef __kernel_uid32_t uid_t;
    @@ -45,14 +44,6 @@ typedef __kernel_old_uid_t old_uid_t;
    typedef __kernel_old_gid_t old_gid_t;
    #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__)
    typedef __kernel_loff_t loff_t;
    #endif
    @@ -154,7 +145,7 @@ typedef unsigned long blkcnt_t;
    #define pgoff_t unsigned long
    #endif

    -#endif /* __KERNEL_STRICT_NAMES */
    +#endif /* __KERNEL__ */

    /*
    * Below are truly Linux-specific types that should never collide with
    --
    1.5.6.3
    --



    \
     
     \ /
      Last update: 2009-02-26 01:05    [W:0.020 / U:0.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site