@@ -1420,10 +1420,24 @@
 	esac
 
 	AC_CHECK_HEADER(sys/socket.h, [
 		AC_DEFINE(OF_HAVE_SYS_SOCKET_H, 1,
 			[Whether we have sys/socket.h])
+	])
+	AC_CHECK_MEMBER([struct sockaddr_storage.ss_family], [
+		AC_DEFINE(OF_HAVE_SOCKADDR_STORAGE, 1,
+			[Whether we have struct sockaddr_storage])
+	], [], [
+		#ifdef OF_HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
+		#ifdef OF_HAVE_SYS_SOCKET_H
+		# include <sys/socket.h>
+		#endif
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
 	])
 
 	AC_CHECK_HEADER(netinet/in.h, [
 		AC_DEFINE(OF_HAVE_NETINET_IN_H, 1,
 			[Whether we have netinet/in.h])