lkml.org 
[lkml]   [2015]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 78/79] include/uapi/linux/errqueue.h: include time.h in userspace
    Date
    linux/time.h conflicts with userspace header time.h. Try to be compatible
    for kernel and userspace.

    Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
    ---
    include/uapi/linux/errqueue.h | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
    index 6b1cdc6..b310b2c 100644
    --- a/include/uapi/linux/errqueue.h
    +++ b/include/uapi/linux/errqueue.h
    @@ -2,7 +2,12 @@
    #define _UAPI_LINUX_ERRQUEUE_H

    #include <linux/types.h>
    +
    +#ifdef __KERNEL__
    #include <linux/time.h>
    +#else
    +#include <time.h>
    +#endif /* __KERNEL__ */

    struct sock_extended_err {
    __u32 ee_errno;
    --
    2.5.0


    \
     
     \ /
      Last update: 2015-10-15 08:41    [W:2.572 / U:1.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site