From 2f32c8dcf2211e0be4b323c53440c9349acc041e Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 21 Apr 2022 15:25:49 +0800 Subject: [PATCH] environ: Don't expose get_environ_ptr in csdlib since it isn't defined in c/c++ standard Signed-off-by: Xiang Xiao --- include/cxx/cstdlib | 3 --- include/stdlib.h | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/cxx/cstdlib b/include/cxx/cstdlib index eace8b417a8..8443f4f7b0d 100644 --- a/include/cxx/cstdlib +++ b/include/cxx/cstdlib @@ -42,9 +42,6 @@ namespace std // Environment variable support -#ifndef CONFIG_DISABLE_ENVIRON - using ::get_environ_ptr; -#endif using ::getenv; using ::putenv; using ::clearenv; diff --git a/include/stdlib.h b/include/stdlib.h index d40d0e0fed0..534dcb7db31 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -62,7 +62,11 @@ * function call. However, get_environ_ptr() can be used in its place. */ -#define environ get_environ_ptr() +#ifdef CONFIG_DISABLE_ENVIRON +# define environ NULL +#else +# define environ get_environ_ptr() +#endif #if defined(CONFIG_FS_LARGEFILE) && defined(CONFIG_HAVE_LONG_LONG) # define mkstemp64 mkstemp @@ -138,11 +142,7 @@ void arc4random_buf(FAR void *bytes, size_t nbytes); /* Environment variable support */ -#ifdef CONFIG_DISABLE_ENVIRON -# define get_environ_ptr() NULL -#else FAR char **get_environ_ptr(void); -#endif FAR char *getenv(FAR const char *name); int putenv(FAR const char *string); int clearenv(void);