Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c
index 4d7ab9d9758428c003a74d9f85699d7fc6922e05..f44498258d4c2a0ebd1379ed818d9d04b56f0761 100644 (file)
--- a/compat/inet_ntop.c
+++ b/compat/inet_ntop.c
@@ -18,7 +18,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdio.h>