diff options
| author | lloyd <[email protected]> | 2010-06-11 12:32:42 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-06-11 12:32:42 +0000 |
| commit | 19278e2242fc5f9b32b294d27b1c20d69b1f7bbc (patch) | |
| tree | 99cf980187e2c398b27771d3133a7cdeff06c0ed | |
| parent | eb7b919a345baccf68ab4f58257a5ff2da3b1496 (diff) | |
Include generic mp_asmi.h for MSVC
Don't use /EHc; it says "C" functions are nothrow, which is not true
for bigint_sub2_rev.
Include needed <intrin.h> for mp_asm.h
| -rw-r--r-- | src/build-data/cc/msvc.txt | 2 | ||||
| -rw-r--r-- | src/math/bigint/mp_amd64_msvc/info.txt | 1 | ||||
| -rw-r--r-- | src/math/bigint/mp_amd64_msvc/mp_asm.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 273f1c5c0..24d91b3f3 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -11,7 +11,7 @@ add_lib_option "" no_debug_flags "/O2" debug_flags "/Od /Zi /DDEBUG" check_opt_flags "/O2 /D_CONSOLE" -lang_flags "/EHsc /GR" +lang_flags "/EHs /GR" warning_flags "/W3 /wd4275" shared_flags "/DBOTAN_DLL=__declspec(dllexport)" diff --git a/src/math/bigint/mp_amd64_msvc/info.txt b/src/math/bigint/mp_amd64_msvc/info.txt index b6f322b83..56ae05927 100644 --- a/src/math/bigint/mp_amd64_msvc/info.txt +++ b/src/math/bigint/mp_amd64_msvc/info.txt @@ -4,6 +4,7 @@ mp_bits 64 <header:internal> mp_asm.h +mp_generic:mp_asmi.h </header:internal> <arch> diff --git a/src/math/bigint/mp_amd64_msvc/mp_asm.h b/src/math/bigint/mp_amd64_msvc/mp_asm.h index 09ca303df..3acbe11bb 100644 --- a/src/math/bigint/mp_amd64_msvc/mp_asm.h +++ b/src/math/bigint/mp_amd64_msvc/mp_asm.h @@ -9,6 +9,7 @@ #define BOTAN_MP_ASM_H__ #include <botan/mp_types.h> +#include <intrin.h> #if (BOTAN_MP_WORD_BITS != 64) #error The mp_amd64_msvc module requires that BOTAN_MP_WORD_BITS == 64 |