fix build of dlltest project on MSVC 2008

fix compile on C++Builder 2010
2010-07-24 05:35:54 +00:00 · 2010-07-24 05:35:54 +00:00 · bc0806d50d
parent 57de1d522b
commit bc0806d50d
2 changed files with 6 additions and 2 deletions
--- a/dlltest.cpp
+++ b/dlltest.cpp
@ -3,7 +3,6 @@
 #endif

 #include "dll.h"
-#include <iostream>

 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)
--- a/stdcpp.h
+++ b/stdcpp.h
@ -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