From 31f52a19713a9f8a82abe5c3ca71b9e30379df63 Mon Sep 17 00:00:00 2001
From: Juha Niskanen <juha.niskanen@haltian.com>
Date: Wed, 13 Jan 2021 20:00:25 +0200
Subject: [PATCH] netutils/ftpd: fix compilation on dual-stack systems

Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
---
 netutils/ftpd/ftpd.c |  2 +-
 netutils/ftpd/ftpd.h | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index e96d91d0b..4c98a08df 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -3191,7 +3191,7 @@ static int ftpd_command_pasv(FAR struct ftpd_session_s *session)
         {
           /* convert ipv6 to ipv4 */
 
-          in_addr in4addr;
+          struct in_addr in4addr;
 
           in4addr.s_addr = session->data.addr.in6.sin6_addr.s6_addr32[3];
 
diff --git a/netutils/ftpd/ftpd.h b/netutils/ftpd/ftpd.h
index 13efcaca0..32369333c 100644
--- a/netutils/ftpd/ftpd.h
+++ b/netutils/ftpd/ftpd.h
@@ -50,6 +50,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* FPTD Definitions *********************************************************/
 
 #define FTPD_SESSIONFLAG_USER       (1 << 0)  /* Session has a user */
@@ -67,6 +68,7 @@
 /****************************************************************************
  * Public Types
  ****************************************************************************/
+
 /* This enumerates the type of each session */
 
 enum ftpd_sessiontype_e
@@ -92,7 +94,8 @@ union ftpd_sockaddr_u
   struct sockaddr            sa;
 #ifdef CONFIG_NET_IPv6
   struct sockaddr_in6        in6;
-#else
+#endif
+#ifdef CONFIG_NET_IPv4
   struct sockaddr_in         in4;
 #endif
 };
@@ -178,23 +181,4 @@ struct ftpd_protocol_s
   int value;
 };
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C"
-{
-#else
-#define EXTERN extern
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
 #endif /* __APPS_NETUTILS_FTPD_FTPD_H */