This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 5451214 ftpd: Remove usage of deprecated macro __NUTTX__
5451214 is described below
commit 5451214d0bcc5cf7987d83e636597eb410d79ec9
Author: Huang Qi <[email protected]>
AuthorDate: Mon Feb 14 11:37:30 2022 +0800
ftpd: Remove usage of deprecated macro __NUTTX__
Signed-off-by: Huang Qi <[email protected]>
---
netutils/ftpd/ftpd.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index d6f5ac3..5d341b7 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -69,12 +69,6 @@
#include "ftpd.h"
/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define __NUTTX__ 1 /* Flags some unusual NuttX dependencies */
-
-/****************************************************************************
* Private Function Prototypes
****************************************************************************/
@@ -2261,7 +2255,7 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s
*session,
offset += snprintf(&buffer[offset], buflen - offset, "%s", str);
-#ifdef __NUTTX__
+#ifdef __NuttX__
/* Fake nlink, user id, and group id */
offset += snprintf(&buffer[offset], buflen - offset, "%4u %8u %8u",
@@ -2311,7 +2305,7 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s
*session,
/* linkname */
-#ifndef __NUTTX__
+#ifndef __NuttX__
if (S_ISLNK(st->st_mode) != 0)
{
FAR char *temp;
