From ab14fe398b2693da319e4bd47ed1adda704e8175 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sat, 16 Jul 2011 15:52:15 +0000
Subject: Make NX and NXTEXT built-ins; extend stm3210e-eval/nsh2 config to run
 the NX example from the NX command line

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3791 42af7a65-404d-4744-a932-0658087f49c3
---
 apps/examples/nx/nx_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'apps/examples/nx/nx_main.c')

diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c
index 3f0578e3f..d8b1eaba0 100644
--- a/apps/examples/nx/nx_main.c
+++ b/apps/examples/nx/nx_main.c
@@ -610,10 +610,14 @@ static int nxeg_initialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: user_start
+ * Name: user_start/nx_main
  ****************************************************************************/
 
+#ifdef CONFIG_EXAMPLES_NX_BUILTIN
+int nx_main(int argc, char **argv)
+#else
 int user_start(int argc, char *argv[])
+#endif
 {
   NXEGWINDOW hwnd1;
   NXEGWINDOW hwnd2;
-- 
cgit v1.2.3