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

13 years ago · 09abcd567e
parent ec8fb32336 7173c82382
commit 09abcd567e
1 changed files with 11 additions and 1 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@ -42,6 +42,17 @@

 #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
    #define HAVE_OPENMP
 #endif
@ -85,7 +96,6 @@
        #include <omp.h>
    #elif defined HAVE_GCD
        #include <dispatch/dispatch.h>
-        #include <sys/sysctl.h>
        #include <pthread.h>
    #elif defined HAVE_CONCURRENCY
        #include <ppl.h>