Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.
This commit is contained in:
@@ -59,16 +59,7 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined WIN32 || defined WINCE
|
||||
# ifndef _WIN32_WINNT // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
|
||||
# define _WIN32_WINNT 0x0400 // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
|
||||
# endif
|
||||
# include <windows.h>
|
||||
# undef small
|
||||
# undef min
|
||||
# undef max
|
||||
# undef abs
|
||||
#else
|
||||
#if !defined WIN32 && !defined WINCE
|
||||
# include <pthread.h>
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user