Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-13 13:55:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8353 from lpetre:backport_3593

Browse Source 
backport of PR #3593
This commit is contained in:
Alexander Alekhin
2017-03-13 10:01:07 +00:00
committed by GitHub
parent d856604a4a 61936eb1a4
commit ec784331fb
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

2
modules/core/src/system.cpp
View File

@@ -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

2
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@@ -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