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
9ce9fc33
Commit
9ce9fc33
authored
Nov 26, 2013
by
Séverin Lemaignan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure compilation to Javascript with Emscripten
parent
16a11cfb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
operations.hpp
modules/core/include/opencv2/core/operations.hpp
+4
-2
system.cpp
modules/core/src/system.cpp
+1
-1
No files found.
modules/core/include/opencv2/core/operations.hpp
View file @
9ce9fc33
...
...
@@ -56,7 +56,7 @@
#define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__
#if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__
#if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__
&& !defined __EMSCRIPTEN__
#ifdef __ATOMIC_SEQ_CST
#define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), (delta), __ATOMIC_SEQ_CST)
#else
...
...
@@ -66,7 +66,9 @@
#if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__) || \
(defined __GNUC__ && defined _STLPORT_MAJOR)
(defined __GNUC__ && defined _STLPORT_MAJOR) || \
defined __EMSCRIPTEN__
#define CV_XADD __sync_fetch_and_add
#else
#include <ext/atomicity.h>
...
...
modules/core/src/system.cpp
View file @
9ce9fc33
...
...
@@ -126,7 +126,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include <stdarg.h>
#if defined __linux__ || defined __APPLE__
#if defined __linux__ || defined __APPLE__
|| defined __EMSCRIPTEN__
#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