From fe5ce30f92d0ec74b26e002767732ea1a05830fe Mon Sep 17 00:00:00 2001
From: Petr Sumbera <sumbera@volny.cz>
Date: Thu, 21 May 2015 13:24:03 -0700
Subject: [PATCH] winsock.c Solaris build fixes

---
 CMakeLists.txt                   | 1 +
 config.h.in                      | 1 +
 winpr/libwinpr/winsock/winsock.c | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db8ac336a..a2e8e5baf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,6 +327,7 @@ if(NOT IOS)
 	check_include_files(inttypes.h HAVE_INTTYPES_H)
 	check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
 	check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
+	check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H)
 	check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H)
 	check_include_files(sys/select.h HAVE_SYS_SELECT_H)
 else()
diff --git a/config.h.in b/config.h.in
index f73c53294..528804066 100644
--- a/config.h.in
+++ b/config.h.in
@@ -22,6 +22,7 @@
 #cmakedefine HAVE_SYS_MODEM_H
 #cmakedefine HAVE_SYS_FILIO_H
 #cmakedefine HAVE_SYS_SELECT_H
+#cmakedefine HAVE_SYS_SOCKIO_H
 #cmakedefine HAVE_SYS_STRTIO_H
 #cmakedefine HAVE_EVENTFD_H
 #cmakedefine HAVE_TIMERFD_H
diff --git a/winpr/libwinpr/winsock/winsock.c b/winpr/libwinpr/winsock/winsock.c
index d0aba672a..5f75c2883 100644
--- a/winpr/libwinpr/winsock/winsock.c
+++ b/winpr/libwinpr/winsock/winsock.c
@@ -29,6 +29,12 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
 
 #ifndef _WIN32
 #include <fcntl.h>
@@ -781,7 +787,7 @@ int WSAIoctl(SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer,
 
 next_ifreq:
 
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__sun__)
 		ifreq_len = IFNAMSIZ + ifreq->ifr_addr.sa_len;
 #else
 		ifreq_len = sizeof(*ifreq);