mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 07:13:02 +04:00
Merge pull request #10984 from extrowerk:advanced_haiku_patches
* Haiku supporting patches * Revert uneeded changes * Whitespace cleanup
This commit is contained in:
committed by
Alexander Alekhin
parent
7e9578789b
commit
f3a9f13cb4
@@ -53,7 +53,8 @@
|
||||
#undef abs
|
||||
#endif
|
||||
|
||||
#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
|
||||
#if defined __linux__ || defined __APPLE__ || defined __GLIBC__ \
|
||||
|| defined __HAIKU__
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@@ -721,7 +722,7 @@ int cv::getNumberOfCPUs(void)
|
||||
#elif defined __ANDROID__
|
||||
static int ncpus = getNumberOfCPUsImpl();
|
||||
return ncpus;
|
||||
#elif defined __linux__ || defined __GLIBC__
|
||||
#elif defined __linux__ || defined __GLIBC__ || defined __HAIKU__
|
||||
return (int)sysconf( _SC_NPROCESSORS_ONLN );
|
||||
#elif defined __APPLE__
|
||||
int numCPU=0;
|
||||
|
||||
Reference in New Issue
Block a user