Take over r23166: Patch by Aleksej Saushev: Make TBB compile also for NetBSD.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-7-0@23167 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h b/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h
index 0f22d0bdbdfa4f00de0c8de9f3917b718c1cd1f9..5efa08e2ce6a980f7e8ac92feaa1c52a3962d6b4 100644 (file)
--- a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h
+++ b/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h
@@ -57,7 +57,7 @@ extern "C" __declspec(dllimport) int __stdcall SwitchToThread( void );
 #pragma managed(pop)
 #endif
 
-#elif __linux__ || __FreeBSD__
+#elif __linux__ || __NetBSD__ || __FreeBSD__
 
 #if __i386__
 #include "machine/linux_ia32.h"

diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h b/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h
index e6d52a56f352bd8d055dcfd3c14652aa0c6ed0cb..3fc86b9d77d2552bf118e2d35075e213d516451e 100644 (file)
--- a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h
+++ b/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h
@@ -41,7 +41,7 @@
 #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".dylib"
 #elif __linux__
 #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".so.1"
-#elif __FreeBSD__ || __sun || _AIX
+#elif __NetBSD__ || __FreeBSD__ || __sun || _AIX
 #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".so"
 #else
 #error Unknown OS

diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp
index e390cc1a39766f611544d07b95c3203bf1462139..9c35edf53634e5ec69505cb90037d3aeb876edb4 100644 (file)
--- a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp
+++ b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp
@@ -113,7 +113,7 @@ static const dynamic_link_descriptor MallocLinkTable[] = {
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".dylib"
 #elif __linux__
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX  __TBB_STRING(.so.TBB_COMPATIBLE_INTERFACE_VERSION)
-#elif __FreeBSD__ || __sun || _AIX
+#elif __NetBSD__ || __FreeBSD__ || __sun || _AIX
 #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so"
 #else
 #error Unknown OS

diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp
index abefa6288357f8226078e11e424718f910c02200..8d7c8c97b04558e65534c1baa8ec98981c3df06b 100644 (file)
--- a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp
+++ b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp
@@ -37,7 +37,7 @@
     #include <malloc.h>     /* alloca */
 #else
     #include <dlfcn.h>
-#if __FreeBSD__
+#if __NetBSD__ || __FreeBSD__
     #include <stdlib.h>     /* alloca */
 #else
     #include <alloca.h>

diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h
index ad3389f8c6024f85dbaa9525f4f7f3268942bd70..21d046480da1e1ce8b4189e1e7673ac2e2dcc51d 100644 (file)
--- a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h
+++ b/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h
@@ -40,7 +40,7 @@
 #elif defined(__sun)
 #include <sys/sysinfo.h>
 #include <unistd.h>
-#elif defined(__FreeBSD__) || defined(_AIX)
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(_AIX)
 #include <unistd.h>
 #endif