Merge branch 'master' of github.com:pezmaster31/bamtools

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96d34676a13cbe20e702e654622355cc54467772..b89990e0ecaba46096eb0bc0ef3b516e923954f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ set( LIBRARY_OUTPUT_PATH    "${CMAKE_SOURCE_DIR}/lib" )
 # define compiler flags for all code
 set( CMAKE_BUILD_TYPE Release )
 add_definitions( -Wall -D_FILE_OFFSET_BITS=64 )
+if( "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS" )
+       add_definitions( -DSUN_OS )
+endif()
 
 # add our includes root path
 include_directories( src )

diff --git a/src/api/internal/io/TcpSocketEngine_unix_p.cpp b/src/api/internal/io/TcpSocketEngine_unix_p.cpp
index 5b100e48b2ea90874e1d644024d9474aa681147b..cf598af4ab41baaa644a464c06fab621c38b369c 100644 (file)
--- a/src/api/internal/io/TcpSocketEngine_unix_p.cpp
+++ b/src/api/internal/io/TcpSocketEngine_unix_p.cpp
@@ -12,6 +12,10 @@
 using namespace BamTools;
 using namespace BamTools::Internal;
 
+#ifdef SUN_OS
+#include <sys/filio.h> 
+#endif
+
 #include <cerrno>
 #include <ctime>
 #include <iostream>