David Lang: if there is no sockaddr_storage, make up our own and use that

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/ftp.c b/lib/ftp.c
index c9fa72eda..388e1d289 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -777,11 +777,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
   /******************************************************************
    * IPv6-specific section
    */
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
   struct sockaddr_storage ss;
-#else
-  char ss[256]; /* this should be big enough to fit a lot */
-#endif
   struct addrinfo *res, *ai;
   socklen_t sslen;
   char hbuf[NI_MAXHOST];
diff --git a/lib/setup.h b/lib/setup.h
index 4b3a50765..bf1a642f4 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -309,4 +309,11 @@ typedef int curl_socket_t;
 #define DEBUGF(x)
 #endif
 
-#endif /* __CONFIG_H */
+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+struct sockaddr_storage
+  {
+    char buffer[256];   /* this should be big enough to fit a lot */
+  };
+#endif
+
+#endif /* __SETUP_H */