diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-03-20 15:52:37 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-03-20 15:52:37 +0100 |
| commit | 53eea5892cd1d51f802533adb9ea94e04b4ce86b (patch) | |
| tree | b6875f0aab543e1551c58bfe12d630717894284c /matlab/mex | |
| parent | 4d0d9ca396378813f8559f479ff9a64b0881a627 (diff) | |
| parent | cd32957185094680b84014e1ea8411ce6b142f74 (diff) | |
| download | astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.gz astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.bz2 astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.tar.xz astra-53eea5892cd1d51f802533adb9ea94e04b4ce86b.zip | |
Merge branch 'macOS'
Diffstat (limited to 'matlab/mex')
| -rw-r--r-- | matlab/mex/mexCopyDataHelpFunctions.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index a172a03..74f0538 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -29,12 +29,10 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "mexHelpFunctions.h" -#define HAVE_OMP - #define ROUND_DOWN(x, s) ((x) & ~((s)-1)) -#ifdef HAVE_OMP -# include <omp.h> +#ifdef _OPENMP +#include <omp.h> #endif #if defined(__SSE2__) |