summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDaan Pelt <daan.pelt@gmail.com>2015-02-25 12:02:16 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-02-25 14:12:45 +0100
commit9a60acfc18e72b8aacdc7388617443e9854f4d3b (patch)
treeb9c72b87a1ad931c11153462206afb0464c85d12 /include
parente64e295fc6394124fdb4bf2630c823744eac23ea (diff)
downloadastra-9a60acfc18e72b8aacdc7388617443e9854f4d3b.tar.gz
astra-9a60acfc18e72b8aacdc7388617443e9854f4d3b.tar.bz2
astra-9a60acfc18e72b8aacdc7388617443e9854f4d3b.tar.xz
astra-9a60acfc18e72b8aacdc7388617443e9854f4d3b.zip
Moved pthreads defines to Globals.h
Diffstat (limited to 'include')
-rw-r--r--include/astra/AsyncAlgorithm.h4
-rw-r--r--include/astra/Globals.h7
2 files changed, 8 insertions, 3 deletions
diff --git a/include/astra/AsyncAlgorithm.h b/include/astra/AsyncAlgorithm.h
index 36e2184..a3157fc 100644
--- a/include/astra/AsyncAlgorithm.h
+++ b/include/astra/AsyncAlgorithm.h
@@ -32,14 +32,12 @@ $Id$
#include "Config.h"
#include "Algorithm.h"
-#ifdef __linux__
-#define USE_PTHREADS
+#ifdef USE_PTHREADS
#include <pthread.h>
#else
#include <boost/thread.hpp>
#endif
-
namespace astra {
/**
diff --git a/include/astra/Globals.h b/include/astra/Globals.h
index fdeaa23..9c8ddfb 100644
--- a/include/astra/Globals.h
+++ b/include/astra/Globals.h
@@ -306,4 +306,11 @@ _AstraExport inline bool cudaEnabled() { return false; }
#endif
+//----------------------------------------------------------------------------------------
+// use pthreads on Linux and OSX
+#if defined(__linux__) || defined(__MACH__)
+#define USE_PTHREADS
+#endif
+
+
#endif