generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3593 from kilobyte:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-01-13 12:25:21 +00:00
commit b2a5e66fc5
3 changed files with 3 additions and 3 deletions
Show Stats 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> #include <sys/types.h>
#if defined ANDROID #if defined ANDROID
#include <sys/sysconf.h> #include <sys/sysconf.h>
#else #elif defined __APPLE__
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#endif #endif

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

@ -163,8 +163,6 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include <sys/types.h> #include <sys/types.h>
#if defined ANDROID #if defined ANDROID
#include <sys/sysconf.h> #include <sys/sysconf.h>
#else
#include <sys/sysctl.h>
#endif #endif
#endif #endif

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

@ -139,8 +139,10 @@ extern "C" {
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#if defined __APPLE__
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#endif
#ifndef MIN #ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))