Merge pull request #2102 from Nerei:compilatin_for_windows

4e35ebb5 · Roman Donchenko · OpenCV Buildbot · 1c3bfae2 · c2dd7fd7 · 4e35ebb5
Commit 4e35ebb5 authored Jan 09, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jan 09, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

cvdef.h modules/core/include/opencv2/core/cvdef.h +1 -0

No files found.
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -459,6 +459,7 @@ CV_INLINE int cvIsInf( double value )
 #    endif
 #  endif
 #elif defined _MSC_VER && !defined RC_INVOKED
+#  include <intrin.h>
 #  define CV_XADD(addr, delta) (int)_InterlockedExchangeAdd((long volatile*)addr, delta)
 #else
   CV_INLINE CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; return tmp; }