Skip to content

Commit

Permalink
Merge pull request #9877 from mapreri:non-linux
Browse files Browse the repository at this point in the history
  • Loading branch information
alalek committed Oct 30, 2017
2 parents c6fc7cc + d026d7d commit bc9c9ab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions modules/core/src/parallel.cpp
Expand Up @@ -52,7 +52,7 @@
#undef abs
#endif

#if defined __linux__ || defined __APPLE__
#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
Expand Down Expand Up @@ -672,7 +672,7 @@ int cv::getNumberOfCPUs(void)
#elif defined __ANDROID__
static int ncpus = getNumberOfCPUsImpl();
return ncpus;
#elif defined __linux__
#elif defined __linux__ || defined __GLIBC__
return (int)sysconf( _SC_NPROCESSORS_ONLN );
#elif defined __APPLE__
int numCPU=0;
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/system.cpp
Expand Up @@ -215,7 +215,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include "omp.h"
#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 <stdio.h>
#include <sys/types.h>
Expand Down

0 comments on commit bc9c9ab

Please sign in to comment.