From debcca71d9c19481abdb54b58b4e4de70e6c2cd0 Mon Sep 17 00:00:00 2001 From: p00670060 Date: Fri, 28 Oct 2022 12:08:07 +0800 Subject: [PATCH] musl: Upgrade musl HongMeng inclusion DTS/AR: AR.SR.IREQ02850018.001.002 TestPolicyOwner: Wu Wenguo CVE: NA TestCase: This is a commit no need test -------- Signed-off-by: Pu Wenxu --- include/locale.h | 2 +- include/stddef.h | 2 +- include/stdio.h | 2 +- include/stdlib.h | 2 +- include/string.h | 2 +- include/time.h | 2 +- include/unistd.h | 2 +- include/wchar.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/locale.h b/include/locale.h index 959d0605..9b1b3054 100644 --- a/include/locale.h +++ b/include/locale.h @@ -8,7 +8,7 @@ extern "C" { #include #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/stddef.h b/include/stddef.h index 7aeed3f7..30876221 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -2,7 +2,7 @@ #define _STDDEF_H #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/stdio.h b/include/stdio.h index cf0980c8..fc761038 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -26,7 +26,7 @@ extern "C" { #include #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/stdlib.h b/include/stdlib.h index 3fc5f58d..f50dee40 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -8,7 +8,7 @@ extern "C" { #include #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/string.h b/include/string.h index 0f0ef4b4..0701d728 100644 --- a/include/string.h +++ b/include/string.h @@ -8,7 +8,7 @@ extern "C" { #include #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/time.h b/include/time.h index a76a3962..d08f568a 100644 --- a/include/time.h +++ b/include/time.h @@ -8,7 +8,7 @@ extern "C" { #include #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/unistd.h b/include/unistd.h index 25016c64..53099349 100755 --- a/include/unistd.h +++ b/include/unistd.h @@ -18,7 +18,7 @@ extern "C" { #define SEEK_HOLE 4 #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L diff --git a/include/wchar.h b/include/wchar.h index 31aa7d1d..115993d1 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -39,7 +39,7 @@ extern "C" { #endif #ifndef NULL -#if __cplusplus >= 201103L +#if defined(__cplusplus) && __cplusplus >= 201103L #define NULL nullptr #elif defined(__cplusplus) #define NULL 0L -- 2.22.0