diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-18 10:29:45 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-18 10:30:57 +0100 |
| commit | e3f8ba57f40998aa39727e5e4b11d95dad3dd447 (patch) | |
| tree | 6a630a824053e7ed09ef0a0d49a1fba2d9345087 | |
| parent | score: C++ compatibility (diff) | |
| download | rtems-e3f8ba57f40998aa39727e5e4b11d95dad3dd447.tar.bz2 | |
ftpd: Resolve function name conflict
Visible with Newlib be657151f12f4d198e45395987f0a626ee1bbb91.
| -rw-r--r-- | cpukit/ftpd/ftpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c index 94b8ee0966..161bfecc5d 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); } |