From commits-return-8531-archive-asf-public=cust-asf.ponee.io@nuttx.apache.org Fri May 1 13:43:54 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id A422718066D for ; Fri, 1 May 2020 15:43:54 +0200 (CEST) Received: (qmail 49331 invoked by uid 500); 1 May 2020 13:43:54 -0000 Mailing-List: contact commits-help@nuttx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nuttx.apache.org Delivered-To: mailing list commits@nuttx.apache.org Received: (qmail 49309 invoked by uid 99); 1 May 2020 13:43:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 May 2020 13:43:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id D28F68BFAD; Fri, 1 May 2020 13:43:53 +0000 (UTC) Date: Fri, 01 May 2020 13:43:54 +0000 To: "commits@nuttx.apache.org" Subject: [incubator-nuttx] 01/03: builtin: Remove HAVE_BUILTIN_CONTEXT macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: acassis@apache.org In-Reply-To: <158834063364.7715.4269951855091335736@gitbox.apache.org> References: <158834063364.7715.4269951855091335736@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-nuttx X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: fe5cb9529d7539270bc6664a72c60f77ac85547a X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20200501134353.D28F68BFAD@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit fe5cb9529d7539270bc6664a72c60f77ac85547a Author: Xiang Xiao AuthorDate: Thu Apr 30 14:35:04 2020 +0800 builtin: Remove HAVE_BUILTIN_CONTEXT macro it's enough to decide which code should be compiled with CONFIG_BUILTIN and CONFIG_FS_BINFS Signed-off-by: Xiang Xiao --- binfmt/binfmt.h | 4 ++-- binfmt/binfmt_initialize.c | 2 +- binfmt/builtin.c | 4 ++-- include/nuttx/lib/builtin.h | 10 ---------- libs/libc/builtin/lib_builtin_forindex.c | 4 ---- libs/libc/builtin/lib_builtin_getname.c | 4 ---- libs/libc/builtin/lib_builtin_isavail.c | 4 ---- 7 files changed, 5 insertions(+), 27 deletions(-) diff --git a/binfmt/binfmt.h b/binfmt/binfmt.h index d26bd31..371d6f3 100644 --- a/binfmt/binfmt.h +++ b/binfmt/binfmt.h @@ -147,7 +147,7 @@ void binfmt_freeargv(FAR struct binary_s *bin); * ****************************************************************************/ -#if defined(CONFIG_FS_BINFS) && defined(HAVE_BUILTIN_CONTEXT) +#ifdef CONFIG_FS_BINFS int builtin_initialize(void); #endif @@ -162,7 +162,7 @@ int builtin_initialize(void); * ****************************************************************************/ -#if defined(CONFIG_FS_BINFS) && defined(HAVE_BUILTIN_CONTEXT) +#ifdef CONFIG_FS_BINFS void builtin_uninitialize(void); #endif diff --git a/binfmt/binfmt_initialize.c b/binfmt/binfmt_initialize.c index 14c9558..99d16bb 100644 --- a/binfmt/binfmt_initialize.c +++ b/binfmt/binfmt_initialize.c @@ -64,7 +64,7 @@ void binfmt_initialize(void) { int ret; -#if defined(CONFIG_FS_BINFS) && defined(HAVE_BUILTIN_CONTEXT) +#ifdef CONFIG_FS_BINFS ret = builtin_initialize(); if (ret < 0) { diff --git a/binfmt/builtin.c b/binfmt/builtin.c index a3356d2..57b2431 100644 --- a/binfmt/builtin.c +++ b/binfmt/builtin.c @@ -53,7 +53,7 @@ #include #include -#ifdef HAVE_BUILTIN_CONTEXT +#ifdef CONFIG_FS_BINFS /**************************************************************************** * Private Function Prototypes @@ -191,4 +191,4 @@ void builtin_uninitialize(void) unregister_binfmt(&g_builtin_binfmt); } -#endif /* HAVE_BUILTIN_CONTEXT */ +#endif /* CONFIG_FS_BINFS */ diff --git a/include/nuttx/lib/builtin.h b/include/nuttx/lib/builtin.h index 8e853d5..6d36520 100644 --- a/include/nuttx/lib/builtin.h +++ b/include/nuttx/lib/builtin.h @@ -53,16 +53,6 @@ #ifdef CONFIG_BUILTIN /**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/* This logic is not usable in the KERNEL build from within the kernel. */ - -#if !defined(CONFIG_BUILD_KERNEL) || !defined(__KERNEL__) -# define HAVE_BUILTIN_CONTEXT -#endif - -/**************************************************************************** * Public Types ****************************************************************************/ diff --git a/libs/libc/builtin/lib_builtin_forindex.c b/libs/libc/builtin/lib_builtin_forindex.c index e8f1471..4c4ec70 100644 --- a/libs/libc/builtin/lib_builtin_forindex.c +++ b/libs/libc/builtin/lib_builtin_forindex.c @@ -43,8 +43,6 @@ #include -#ifdef HAVE_BUILTIN_CONTEXT - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -77,5 +75,3 @@ FAR const struct builtin_s *builtin_for_index(int index) return NULL; } - -#endif /* HAVE_BUILTIN_CONTEXT */ diff --git a/libs/libc/builtin/lib_builtin_getname.c b/libs/libc/builtin/lib_builtin_getname.c index 5627856..fa7a7b2 100644 --- a/libs/libc/builtin/lib_builtin_getname.c +++ b/libs/libc/builtin/lib_builtin_getname.c @@ -48,8 +48,6 @@ #include -#ifdef HAVE_BUILTIN_CONTEXT - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -83,5 +81,3 @@ FAR const char *builtin_getname(int index) return NULL; } - -#endif /* HAVE_BUILTIN_CONTEXT */ diff --git a/libs/libc/builtin/lib_builtin_isavail.c b/libs/libc/builtin/lib_builtin_isavail.c index 3a99fe0..d5b8f56 100644 --- a/libs/libc/builtin/lib_builtin_isavail.c +++ b/libs/libc/builtin/lib_builtin_isavail.c @@ -52,8 +52,6 @@ #include -#ifdef HAVE_BUILTIN_CONTEXT - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -92,5 +90,3 @@ int builtin_isavail(FAR const char *appname) return -ENOENT; } - -#endif /* HAVE_BUILTIN_CONTEXT */