Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
bc9c9aba
Commit
bc9c9aba
authored
Oct 30, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9877 from mapreri:non-linux
parents
c6fc7ccb
d026d7dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
parallel.cpp
modules/core/src/parallel.cpp
+2
-2
system.cpp
modules/core/src/system.cpp
+1
-1
No files found.
modules/core/src/parallel.cpp
View file @
bc9c9aba
...
...
@@ -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>
...
...
@@ -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
;
...
...
modules/core/src/system.cpp
View file @
bc9c9aba
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment