Merge pull request #3593 from kilobyte:master

2015-01-13 12:25:21 +00:00 · 2015-01-13 12:25:21 +00:00 · b2a5e66fc5
commit b2a5e66fc5
parent f566f6baa9 7b0d1c932e
3 changed files with 3 additions and 3 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@ -56,7 +56,7 @@
    #include <sys/types.h>
    #if defined ANDROID
        #include <sys/sysconf.h>
-    #else
+    #elif defined __APPLE__
        #include <sys/sysctl.h>
    #endif
 #endif
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@ -163,8 +163,6 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
 #include <sys/types.h>
 #if defined ANDROID
 #include <sys/sysconf.h>
-#else
-#include <sys/sysctl.h>
 #endif
 #endif

--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@ -139,8 +139,10 @@ extern "C" {
    #include <unistd.h>
    #include <stdio.h>
    #include <sys/types.h>
+#if defined __APPLE__
    #include <sys/sysctl.h>
 #endif
+#endif

 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))