aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.inc3
-rw-r--r--lib/ftp.c1
-rw-r--r--lib/setup.h7
-rw-r--r--lib/sockaddr.h36
-rw-r--r--lib/tftp.c1
5 files changed, 40 insertions, 8 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index f204a73f7..eb3565c04 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -18,5 +18,6 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \
share.h md5.h http_digest.h http_negotiate.h http_ntlm.h ca-bundle.h \
inet_pton.h strtoofft.h strerror.h inet_ntop.h curlx.h memory.h \
setup.h transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h \
- gtls.h tftp.h
+ gtls.h tftp.h sockaddr.h
+
diff --git a/lib/ftp.c b/lib/ftp.c
index 388e1d289..16518d9be 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -94,6 +94,7 @@
#include "inet_ntop.h"
#include "select.h"
#include "parsedate.h" /* for the week day and month names */
+#include "sockaddr.h" /* required for sockaddr_storage */
#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
#include "inet_ntoa_r.h"
diff --git a/lib/setup.h b/lib/setup.h
index bf1a642f4..5249d2e5f 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -309,11 +309,4 @@ typedef int curl_socket_t;
#define DEBUGF(x)
#endif
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-struct sockaddr_storage
- {
- char buffer[256]; /* this should be big enough to fit a lot */
- };
-#endif
-
#endif /* __SETUP_H */
diff --git a/lib/sockaddr.h b/lib/sockaddr.h
new file mode 100644
index 000000000..938d20b20
--- /dev/null
+++ b/lib/sockaddr.h
@@ -0,0 +1,36 @@
+#ifndef __SOCKADDR_H
+#define __SOCKADDR_H
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#include "setup.h"
+
+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
+struct sockaddr_storage
+ {
+ char buffer[256]; /* this should be big enough to fit a lot */
+ };
+#endif
+
+
+#endif /* __SOCKADDR_H */
diff --git a/lib/tftp.c b/lib/tftp.c
index 201f7d26c..0ca45f834 100644
--- a/lib/tftp.c
+++ b/lib/tftp.c
@@ -75,6 +75,7 @@
#include "progress.h"
#include "connect.h"
#include "strerror.h"
+#include "sockaddr.h" /* required for sockaddr_storage */
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>