generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #50 from taka-no-me:parallel/fix-build-2445

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-19 14:57:08 +04:00
commit 09abcd567e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/parallel.cpp
View File

@ -42,6 +42,17 @@
#include "precomp.hpp" #include "precomp.hpp"
#if defined __linux__ || defined __APPLE__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
#else
#include <sys/sysctl.h>
#endif
#endif
#ifdef _OPENMP #ifdef _OPENMP
#define HAVE_OPENMP #define HAVE_OPENMP
#endif #endif
@ -85,7 +96,6 @@
#include <omp.h> #include <omp.h>
#elif defined HAVE_GCD #elif defined HAVE_GCD
#include <dispatch/dispatch.h> #include <dispatch/dispatch.h>
#include <sys/sysctl.h>
#include <pthread.h> #include <pthread.h>
#elif defined HAVE_CONCURRENCY #elif defined HAVE_CONCURRENCY
#include <ppl.h> #include <ppl.h>