Merge pull request #8353 from lpetre:backport_3593

backport of PR #3593

Merge pull request #8353 from lpetre:backport_3593
backport of PR #3593
ec784331 · Alexander Alekhin · GitHub · d856604a · 61936eb1 · ec784331
Commit ec784331 authored Mar 13, 2017 by Alexander Alekhin Committed by GitHub Mar 13, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

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

cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +1 -1

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/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -129,9 +129,9 @@ extern "C" {
    #include <unistd.h>
    #include <stdio.h>
    #include <sys/types.h>
-    #include <sys/sysctl.h>
    #include <sys/time.h>
 #if defined __APPLE__
+    #include <sys/sysctl.h>
    #include <mach/clock.h>
    #include <mach/mach.h>
 #endif