diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-18 10:35:42 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-03-18 10:35:42 +0100 |
| commit | 652b024e94db238e26967b87cc93330aac3c30f5 (patch) | |
| tree | e1cdfb0e3b79a942df0fb17981984913c7521ff2 /rtemsbsd/ftpd | |
| parent | Update due to Watchdog Handler changes (diff) | |
| download | rtems-libbsd-652b024e94db238e26967b87cc93330aac3c30f5.tar.bz2 | |
ftpd: Resolve function name conflict
Visible with Newlib be657151f12f4d198e45395987f0a626ee1bbb91.
Diffstat (limited to 'rtemsbsd/ftpd')
| -rw-r--r-- | rtemsbsd/ftpd/ftpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rtemsbsd/ftpd/ftpd.c b/rtemsbsd/ftpd/ftpd.c index 3cfed57f..fddc03e6 100644 --- a/rtemsbsd/ftpd/ftpd.c +++ b/rtemsbsd/ftpd/ftpd.c @@ -1983,7 +1983,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 @@ -1996,7 +1996,7 @@ session(rtems_task_argument arg) * NONE */ static void -daemon(rtems_task_argument args __attribute__((unused))) +ftpd_daemon(rtems_task_argument args __attribute__((unused))) { int s; socklen_t addrLen; @@ -2144,7 +2144,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); } |