Merge pull request #3593 from kilobyte:master

b2a5e66f · Vadim Pisarevsky · f566f6ba · 7b0d1c93 · b2a5e66f · b2a5e66f
Commit b2a5e66f authored Jan 13, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

parallel.cpp modules/core/src/parallel.cpp +1 -1

system.cpp modules/core/src/system.cpp +0 -2

cap_ffmpeg_impl.hpp modules/videoio/src/cap_ffmpeg_impl.hpp +2 -0

No files found.
--- 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))