From 6b938816d1fcc879f4b1607cceb8965ed1f59d66 Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Fri, 13 Jul 2018 11:52:46 +0000 Subject: [PATCH] Merged in masayuki2009/nuttx.apps/fix_helloxx (pull request #144) apps/examples/helloxx: Add main() for CONFIG_BUILD_KERNEL Signed-off-by: Masayuki Ishikawa Approved-by: GregoryN --- examples/helloxx/helloxx_main.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx index a5279a750..0a2896e77 100644 --- a/examples/helloxx/helloxx_main.cxx +++ b/examples/helloxx/helloxx_main.cxx @@ -127,7 +127,11 @@ static CHelloWorld g_HelloWorld; extern "C" { +#ifdef CONFIG_BUILD_KERNEL + int main(int argc, FAR char *argv[]) +#else int helloxx_main(int argc, char *argv[]) +#endif { // If C++ initialization for static constructors is supported, then do // that first