From 93f6cc01a6365064c939b2b04bc805fc00225c55 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 11 Jan 2011 00:44:27 +0000 Subject: [PATCH] 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 --- deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h | 2 +- deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h | 2 +- .../tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp | 2 +- deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp | 2 +- deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 0f22d0bdbd..5efa08e2ce 100644 --- 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 e6d52a56f3..3fc86b9d77 100644 --- 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 e390cc1a39..9c35edf536 100644 --- 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 abefa62883..8d7c8c97b0 100644 --- 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 /* alloca */ #else #include -#if __FreeBSD__ +#if __NetBSD__ || __FreeBSD__ #include /* alloca */ #else #include 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 ad3389f8c6..21d046480d 100644 --- 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 #include -#elif defined(__FreeBSD__) || defined(_AIX) +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(_AIX) #include #endif -- 2.39.5