From 97da8b43c97157d3b27d3a338605ccc4b76647ac Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 9 Jun 2015 21:22:11 -0700
Subject: [PATCH] All: Some portability fixes

---
 CMakeLists.txt        | 2 +-
 src/util/vfs.h        | 7 +++----
 src/util/vfs/vfs-fd.c | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88bbf5721..f0be21c21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,7 @@ if(WIN32)
 	list(APPEND VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-fd.c ${CMAKE_SOURCE_DIR}/src/util/vfs/vfs-dirent.c)
 	file(GLOB OS_SRC ${CMAKE_SOURCE_DIR}/src/platform/windows/*.c)
 	source_group("Windows-specific code" FILES ${OS_SRC})
-else()
+elseif(UNIX)
 	add_definitions(-DUSE_PTHREADS)
 
 	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/src/util/vfs.h b/src/util/vfs.h
index f12c12fdd..bf0e99434 100644
--- a/src/util/vfs.h
+++ b/src/util/vfs.h
@@ -8,13 +8,12 @@
 
 #include "util/common.h"
 
-#ifndef _WIN32
-#include <sys/mman.h>
-#define PATH_SEP "/"
-#else
+#ifdef _WIN32
 #include <io.h>
 #include <windows.h>
 #define PATH_SEP "\\"
+#else
+#define PATH_SEP "/"
 #endif
 
 #ifndef PATH_MAX
diff --git a/src/util/vfs/vfs-fd.c b/src/util/vfs/vfs-fd.c
index f3646c6c8..9487f501f 100644
--- a/src/util/vfs/vfs-fd.c
+++ b/src/util/vfs/vfs-fd.c
@@ -7,6 +7,9 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
+#ifndef _WIN32
+#include <sys/mman.h>
+#endif
 
 struct VFileFD {
 	struct VFile d;