potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #10984 from extrowerk:advanced_haiku_patches

Browse Source 
* Haiku supporting patches

* Revert uneeded changes

* Whitespace cleanup
This commit is contained in:
miqlas
2018-03-14 15:09:10 +01:00
committed by Alexander Alekhin
parent 7e9578789b
commit f3a9f13cb4
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_ffmpeg_impl.hpp
+2 -2
View File
@@ -101,7 +101,7 @@ extern "C" {
long tv_nsec;
};
#endif
#elif defined __linux__ || defined __APPLE__
#elif defined __linux__ || defined __APPLE__ || defined __HAIKU__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
@@ -298,7 +298,7 @@ static int get_number_of_cpus(void)
GetSystemInfo( &sysinfo );
return (int)sysinfo.dwNumberOfProcessors;
#elif defined __linux__
#elif defined __linux__ || defined __HAIKU__
return (int)sysconf( _SC_NPROCESSORS_ONLN );
#elif defined __APPLE__
int numCPU=0;