lkml.org 
[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 113/230] uapi/linux/stddef.h: Add include guards
    Date
    From: Tadeusz Struk <tadeusz.struk@linaro.org>

    [ Upstream commit 55037ed7bdc62151a726f5685f88afa6a82959b1 ]

    Add include guard wrapper define to uapi/linux/stddef.h to prevent macro
    redefinition errors when stddef.h is included more than once. This was not
    needed before since the only contents already used a redefinition test.

    Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
    Link: https://lore.kernel.org/r/20220329171252.57279-1-tadeusz.struk@linaro.org
    Fixes: 50d7bd38c3aa ("stddef: Introduce struct_group() helper macro")
    Cc: stable@vger.kernel.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/uapi/linux/stddef.h | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
    index 3021ea25a284..7837ba4fe728 100644
    --- a/include/uapi/linux/stddef.h
    +++ b/include/uapi/linux/stddef.h
    @@ -1,4 +1,7 @@
    /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
    +#ifndef _UAPI_LINUX_STDDEF_H
    +#define _UAPI_LINUX_STDDEF_H
    +
    #include <linux/compiler_types.h>

    #ifndef __always_inline
    @@ -41,3 +44,4 @@
    struct { } __empty_ ## NAME; \
    TYPE NAME[]; \
    }
    +#endif
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-07-11 11:51    [W:2.368 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site