Some platforms may have getaddrinfo() but not sockaddr_storage.

diff --git a/rsync.h b/rsync.h
index 191ea5e..f723b34 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -390,6 +390,7 @@ static inline int flist_up(struct file_list *flist, int i)
 #include "proto.h"
 #include "lib/mdfour.h"
 #include "lib/permstring.h"
+#include "lib/addrinfo.h"
 
 /* We have replacement versions of these if they're missing. */
 #ifndef HAVE_ASPRINTF

diff --git a/socket.c b/socket.c
index 02a2511..2c2191e 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -26,10 +26,6 @@
 
 #include "rsync.h"
 
-#ifndef HAVE_GETADDRINFO
-#include "lib/addrinfo.h"
-#endif
-
 /* Establish a proxy connection on an open socket to a web roxy by
  * using the CONNECT method. */
 static int establish_proxy_connection(int fd, char *host, int port)