Skip to content

O
opencv
Commit bc9c9aba authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #9877 from mapreri:non-linux

parents c6fc7ccb d026d7dc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/core/src/parallel.cpp
View file @ bc9c9aba
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#undef abs #undef abs
#endif #endif
#if defined __linux__ || defined __APPLE__ #if defined __linux__ || defined __APPLE__ || defined __GLIBC__
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -672,7 +672,7 @@ int cv::getNumberOfCPUs(void) ...@@ -672,7 +672,7 @@ int cv::getNumberOfCPUs(void)
#elif defined __ANDROID__ #elif defined __ANDROID__
static int ncpus = getNumberOfCPUsImpl(); static int ncpus = getNumberOfCPUsImpl();
return ncpus; return ncpus;
#elif defined __linux__ #elif defined __linux__ || defined __GLIBC__
return (int)sysconf( _SC_NPROCESSORS_ONLN ); return (int)sysconf( _SC_NPROCESSORS_ONLN );
#elif defined __APPLE__ #elif defined __APPLE__
int numCPU=0; int numCPU=0;
......
modules/core/src/system.cpp
View file @ bc9c9aba
...@@ -215,7 +215,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) ...@@ -215,7 +215,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include "omp.h" #include "omp.h"
#endif #endif
#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__ #if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __GLIBC__ || defined __HAIKU__
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment