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

removed "#include "windows.h"" from core headers

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-05-13 20:00:58 +00:00
parent 5199cd9c95
commit fa2f1c036a
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,27 +73,7 @@
#endif
#elif defined WIN32 || defined _WIN32
#if defined _MSC_VER && defined _M_IX86
static inline int CV_XADD( int* addr, int delta )
{
int tmp;
__asm
{
mov edx, addr
mov eax, delta
lock xadd [edx], eax
mov tmp, eax
}
return tmp;
}
#else
#include "windows.h"
#undef min
#undef max
#define CV_XADD(addr,delta) InterlockedExchangeAdd((LONG volatile*)(addr), (delta))
#endif
#define CV_XADD(addr,delta) _InterlockedExchangeAdd((long volatile*)(addr), (delta))
#else
template<typename _Tp> static inline _Tp CV_XADD(_Tp* addr, _Tp delta)