[rtems commit] ftpd: Resolve function name conflict

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    e3f8ba57f40998aa39727e5e4b11d95dad3dd447
Changeset: http://git.rtems.org/rtems/commit/?id=e3f8ba57f40998aa39727e5e4b11d95dad3dd447

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Mar 18 10:29:45 2016 +0100

ftpd: Resolve function name conflict

Visible with Newlib be657151f12f4d198e45395987f0a626ee1bbb91.

---

 cpukit/ftpd/ftpd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index 94b8ee0..161bfec 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -1977,7 +1977,7 @@ session(rtems_task_argument arg)
 
 
 /*
- * daemon
+ * ftpd_daemon
  *
  * This task runs forever.  It waits for service requests on the FTP port
  * (port 21 by default).  When a request is received, it opens a new session
@@ -1990,7 +1990,7 @@ session(rtems_task_argument arg)
  *   NONE
  */
 static void
-daemon(rtems_task_argument args RTEMS_UNUSED)
+ftpd_daemon(rtems_task_argument args RTEMS_UNUSED)
 {
   int                 s;
   socklen_t	      addrLen;
@@ -2138,7 +2138,7 @@ rtems_initialize_ftpd(void)
 
   if (sc == RTEMS_SUCCESSFUL)
   {
-    sc = rtems_task_start(tid, daemon, 0);
+    sc = rtems_task_start(tid, ftpd_daemon, 0);
     if (sc != RTEMS_SUCCESSFUL)
       rtems_task_delete(tid);
   }