Rewrite ConvertToGreyscale() and ConvertToDisabled()

[wxWidgets.git] / include / wx / unix / private / sockunix.h

diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h
index 63fc0d885dd372db74a8798124fe8a42e78603f5..642ef43bfa3338a0c3413afa2a22127448ac91dc 100644 (file)
--- a/include/wx/unix/private/sockunix.h
+++ b/include/wx/unix/private/sockunix.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSocketImpl implementation for Unix systems
 // Authors:     Guilhem Lavaux, Vadim Zeitlin
 // Created:     April 1997
-// RCS-ID:      $Id$
 // Copyright:   (c) 1997 Guilhem Lavaux
 //              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -14,6 +13,14 @@
 
 #include <unistd.h>
 #include <sys/ioctl.h>
+
+// Under older (Open)Solaris versions FIONBIO is declared in this header only.
+// In the newer versions it's included by sys/ioctl.h but it's simpler to just
+// include it always instead of testing for whether it is or not.
+#ifdef __SOLARIS__
+    #include <sys/filio.h>
+#endif
+
 #include "wx/private/fdiomanager.h"
 
 class wxSocketImplUnix : public wxSocketImpl,