summaryrefslogtreecommitdiff
path: root/apps/examples/ftpd
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-08-30 20:13:50 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-08-30 20:13:50 +0000
commit79c7065433ae27932ad8b781d38b8f7832b01581 (patch)
treef770414832eeecb35adb70404b31d147afad7235 /apps/examples/ftpd
parentf9d19788072090be80b71ab0d0de14507a6e739b (diff)
downloadnuttx-79c7065433ae27932ad8b781d38b8f7832b01581.tar.gz
nuttx-79c7065433ae27932ad8b781d38b8f7832b01581.tar.bz2
nuttx-79c7065433ae27932ad8b781d38b8f7832b01581.zip
Add configurable application entry point
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5070 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/examples/ftpd')
-rw-r--r--apps/examples/ftpd/ftpd.h10
-rw-r--r--apps/examples/ftpd/ftpd_main.c4
2 files changed, 2 insertions, 12 deletions
diff --git a/apps/examples/ftpd/ftpd.h b/apps/examples/ftpd/ftpd.h
index 98ee3b3b6..6a439e818 100644
--- a/apps/examples/ftpd/ftpd.h
+++ b/apps/examples/ftpd/ftpd.h
@@ -107,16 +107,6 @@
# endif
#endif
-/* Is this being built as an NSH built-in application? */
-
-#ifdef CONFIG_NSH_BUILTIN_APPS
-# define MAIN_NAME ftpd_start
-# define MAIN_STRING "ftpd_start: "
-#else
-# define MAIN_NAME user_start
-# define MAIN_STRING "user_start: "
-#endif
-
/****************************************************************************
* Public Types
****************************************************************************/
diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c
index 6ae0a11e5..6d19f952c 100644
--- a/apps/examples/ftpd/ftpd_main.c
+++ b/apps/examples/ftpd/ftpd_main.c
@@ -217,10 +217,10 @@ int ftpd_daemon(int s_argc, char **s_argv)
* Public Functions
****************************************************************************/
/****************************************************************************
- * Name: user_start/ftpd_start
+ * Name: ftpd_main
****************************************************************************/
-int MAIN_NAME(int s_argc, char **s_argv)
+int ftpd_main(int s_argc, char **s_argv)
{
/* Check if we have already initialized the network */