From 9bb306f8319796d1e96079f93525c214e7687bf1 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Mon, 23 Mar 2015 02:47:10 -0700
Subject: [PATCH] All: Buildfixes for OS X and FreeBSD

---
 CMakeLists.txt    | 7 ++++++-
 src/util/common.h | 1 +
 src/util/socket.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eaf1fef5..519261192 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,16 +120,21 @@ if(WIN32)
 	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c)
 	source_group("Windows-specific code" FILES ${OS_SRC})
 else()
-	add_definitions(-DUSE_PTHREADS -D_BSD_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L)
+	add_definitions(-DUSE_PTHREADS)
 
+	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+		add_definitions(-D_BSD_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=200809L)
+	endif()
 	if(NOT APPLE)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
 	endif()
+
 	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/posix/*.c)
 	source_group("POSIX-specific code" FILES ${OS_SRC})
 endif()
 
 if(APPLE)
+	add_definitions(-D_DARWIN_C_SOURCE)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6")
 endif()
 
diff --git a/src/util/common.h b/src/util/common.h
index 42f62c05f..0f9a90255 100644
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #define UNUSED(V) (void)(V)
diff --git a/src/util/socket.h b/src/util/socket.h
index c5c98a6a3..3a4712052 100644
--- a/src/util/socket.h
+++ b/src/util/socket.h
@@ -23,6 +23,7 @@ typedef SOCKET Socket;
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 
 #define INVALID_SOCKET (-1)