generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1907 from severin-lemaignan:emscripten-2.4

Browse Source
This commit is contained in:
Roman Donchenko 2013-12-03 13:38:10 +04:00 committed by OpenCV Buildbot
commit df136339ff
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/operations.hpp
View File

@ -56,7 +56,7 @@
#define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta) #define CV_XADD(addr,delta) _InterlockedExchangeAdd(const_cast<void*>(reinterpret_cast<volatile void*>(addr)), delta)
#elif defined __GNUC__ #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 #ifdef __ATOMIC_SEQ_CST
#define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), (delta), __ATOMIC_SEQ_CST) #define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), (delta), __ATOMIC_SEQ_CST)
#else #else
@ -66,7 +66,9 @@
#if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \ #if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined __i586__ || \
defined __i686__ || defined __MMX__ || defined __SSE__ || defined __ppc__) || \ 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 #define CV_XADD __sync_fetch_and_add
#else #else
#include <ext/atomicity.h> #include <ext/atomicity.h>

2
modules/core/src/system.cpp
View File

@ -126,7 +126,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include <stdarg.h> #include <stdarg.h>
#if defined __linux__ || defined __APPLE__ #if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>