Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb

This commit is contained in:
marina.kolpakova
2012-11-01 19:26:11 +04:00
7 changed files with 36 additions and 18 deletions

View File

@@ -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