Merge branch 'freebsd-support' of https://git01.codeplex.com/forks/m1xa/casablanca into staging

Author: stgates

Release/include/compat/SafeInt3.hpp

@@ -117,6 +117,17 @@ Version 3.0
 #endif
 #endif
 
+#ifdef __has_feature
+    #ifdef NEEDS_NULLPTR_DEFINED
+        #undef NEEDS_NULLPTR_DEFINED
+    #endif
+    #if __has_feature(cxx_nullptr)
+        #define NEEDS_NULLPTR_DEFINED 0
+    #else
+        #define NEEDS_NULLPTR_DEFINED 1
+    #endif
+#endif
+
 #if NEEDS_NULLPTR_DEFINED
 #define nullptr NULL
 #endif

Release/src/http/listener/http_linux_server.cpp

@@ -71,7 +71,7 @@ void connection::close()
         boost::system::error_code ec;
         sock->cancel(ec);
         sock->shutdown(tcp::socket::shutdown_both, ec);
-        sock->close();
+        sock->close(ec);
     }
     m_request._reply_if_not_already(status_codes::InternalError);
 }

Release/src/pplx/linux/pplxlinux.cpp

@@ -43,7 +43,7 @@ namespace details {
     {
         _PPLXIMP long GetCurrentThreadId()
         {
-            return (long)syscall(SYS_gettid) * 4;
+            return reinterpret_cast<long>(pthread_self());
         }
 
         _PPLXIMP void YieldExecution()