diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2007-06-01 17:28:31 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2007-06-01 17:28:31 +0000 |
| commit | a689a92a5664487e607701539745d3e91ca5f846 (patch) | |
| tree | fcbe5f758c3940795f95d0c197ed6a78a1869b03 | |
| parent | d051ef9dd5b51afb8d53b62dfa06b5b4a36c489d (diff) | |
| download | cryptopp-a689a92a5664487e607701539745d3e91ca5f846.tar.gz | |
fix compile for VC6 without processor pack, and GCC 4 on MINGW
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@376 57ff6487-cd31-0410-9ec3-f628ee90f5f0
| -rw-r--r-- | config.h | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -260,8 +260,7 @@ NAMESPACE_END #define CRYPTOPP_DISABLE_SSE2 #endif -// CodeWarrior defines _MSC_VER -#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) +#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(CRYPTOPP_MSVC6PP_OR_LATER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))) #define CRYPTOPP_X86_ASM_AVAILABLE #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || CRYPTOPP_GCC_VERSION >= 30300) @@ -300,12 +299,6 @@ NAMESPACE_END #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16 #elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__) #define CRYPTOPP_MEMALIGN_AVAILABLE -#elif defined(__MINGW32__) - #ifndef _mm_malloc - #define _mm_malloc(a, b) __mingw_aligned_malloc(a, b) - #define _mm_free(a) __mingw_aligned_free(a) - #endif - #define CRYPTOPP_MM_MALLOC_AVAILABLE #else #define CRYPTOPP_NO_ALIGNED_ALLOC #endif |