Merge pull request #14 from linmajia/master

FreeBSD support.
microsoft · Jun 4, 2015 · 2b7f118 · 2b7f118
2 parents b052a1f + 6c1c237
commit 2b7f118
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 23 deletions.
diff --git a/bin/Darwin/protoc b/bin/Darwin/protoc
diff --git a/bin/Darwin/thrift b/bin/Darwin/thrift
diff --git a/bin/FreeBSD/protoc b/bin/FreeBSD/protoc
diff --git a/bin/FreeBSD/thrift b/bin/FreeBSD/thrift
diff --git a/bin/dsn.cg.sh b/bin/dsn.cg.sh
@@ -1,6 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-SOURCE="${BASH_SOURCE[0]}"
+#SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
   SOURCE="$(readlink "$SOURCE")"

diff --git a/bin/dsn.cmake b/bin/dsn.cmake
@@ -295,6 +295,8 @@ function(dsn_setup_install)
 			install(PROGRAMS "bin/dsn.cg.sh" DESTINATION bin)
 			install(PROGRAMS "bin/Linux/thrift" DESTINATION bin/Linux)
 			install(PROGRAMS "bin/Linux/protoc" DESTINATION bin/Linux)
+			install(PROGRAMS "bin/Darwin/thrift" DESTINATION bin/Darwin)
+			install(PROGRAMS "bin/Darwin/protoc" DESTINATION bin/Darwin)
 			install(PROGRAMS "bin/FreeBSD/thrift" DESTINATION bin/FreeBSD)
 			install(PROGRAMS "bin/FreeBSD/protoc" DESTINATION bin/FreeBSD)
 		endif()

diff --git a/include/dsn/internal/dsn_types.h b/include/dsn/internal/dsn_types.h
@@ -40,18 +40,14 @@ __pragma(warning(disable:4127))
 #define __selectany __declspec(selectany) extern 
 typedef HANDLE handle_t;
 
-#elif defined(__linux__)
+# elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 
-#define __selectany __attribute__((weak)) extern 
+# define __selectany __attribute__((weak)) extern 
 typedef int handle_t;
 
-#define O_BINARY 0
-
-#elif defined(__MACH__)
-
-#define __selectany __attribute__((weak)) extern 
-typedef int handle_t;
-#define O_BINARY 0
+# ifndef O_BINARY
+# define O_BINARY 0
+#endif
 
 #else
 

diff --git a/src/core/coredump.posix.cpp b/src/core/coredump.posix.cpp
@@ -27,8 +27,7 @@
 # include <dsn/internal/coredump.h>
 
 //#ifdef _WIN32
-#if defined(__MACH__) || defined(__linux__)
-
+# if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 
 # define __TITLE__ "coredump"
 
@@ -53,5 +52,5 @@ namespace dsn {
     }
 }
 
-# endif // #if defined(__MACH__) || defined(__linux__)
+# endif // #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 
diff --git a/src/core/end_point.cpp b/src/core/end_point.cpp
@@ -33,6 +33,11 @@
 # include <sys/socket.h>
 # include <netdb.h>
 # include <arpa/inet.h>
+
+# if defined(__FreeBSD__)
+# include <netinet/in.h>
+# endif
+
 # endif
 
 # include <mutex>
@@ -62,7 +67,7 @@ end_point::end_point(const char* str, uint16_t p)
 
     sockaddr_in addr;
     memset(&addr,0,sizeof(addr));
-    addr.sin_family=AF_INET;
+    addr.sin_family = AF_INET;
 
     if ((addr.sin_addr.s_addr = inet_addr(str)) == (unsigned int)(-1))
     {

diff --git a/src/tools/common/native_aio_provider.posix.cpp b/src/tools/common/native_aio_provider.posix.cpp
@@ -24,15 +24,15 @@
  * THE SOFTWARE.
  */
 
-#include "native_aio_provider.posix.h"
+# include "native_aio_provider.posix.h"
 
-#if defined(__MACH__) || defined(__linux__)
+# if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 
-#include <aio.h>
-#include <fcntl.h>
-#include <cstdlib>
+# include <aio.h>
+# include <fcntl.h>
+# include <cstdlib>
 
-#define __TITLE__ "aio.provider.posix"
+# define __TITLE__ "aio.provider.posix"
 
 namespace dsn {
     namespace tools {

diff --git a/src/tools/common/native_aio_provider.posix.h b/src/tools/common/native_aio_provider.posix.h
@@ -27,7 +27,7 @@
 
 # include <dsn/tool_api.h>
 # include <dsn/internal/synchronize.h>
-# if defined(__MACH__) || defined(__linux__)
+# if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
 # include <aio.h>
 # include <fcntl.h>
 # endif
@@ -49,7 +49,7 @@ namespace dsn {
             error_code aio_internal(aio_task_ptr& aio, bool async, __out_param uint32_t* pbytes = nullptr);
 
         private:
-# if defined(__MACH__) || defined(__linux__)
+# if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
             friend void aio_completed(sigval sigval);
 # endif
         };