diff options
author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-24 05:35:54 +0000 |
---|---|---|
committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2010-07-24 05:35:54 +0000 |
commit | b7f66eb51d761c3ba04d5dbf6bbe477fa1985c26 (patch) | |
tree | 01ba768348ac42044e6e1eb34e55410ed9b1f58a /stdcpp.h | |
parent | 2a1a234dd199a14aa5588a1bbccd88265cbf9ec2 (diff) | |
download | cryptopp-b7f66eb51d761c3ba04d5dbf6bbe477fa1985c26.tar.gz |
fix build of dlltest project on MSVC 2008
fix compile on C++Builder 2010
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@506 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'stdcpp.h')
-rw-r--r-- | stdcpp.h | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,11 @@ #ifndef CRYPTOPP_STDCPP_H #define CRYPTOPP_STDCPP_H +#if _MSC_VER >= 1500 +#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY +#include <intrin.h> +#endif + #include <stddef.h> #include <assert.h> #include <limits.h> @@ -22,7 +27,7 @@ // for alloca #ifdef __sun #include <alloca.h> -#elif defined(__MINGW32__) +#elif defined(__MINGW32__) || defined(__BORLANDC__) #include <malloc.h> #endif |