diff options
Diffstat (limited to 'CryptoPP')
| -rw-r--r-- | CryptoPP/config.h | 2 | ||||
| -rw-r--r-- | CryptoPP/misc.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CryptoPP/config.h b/CryptoPP/config.h index 93a79ed3d..ba7c00110 100644 --- a/CryptoPP/config.h +++ b/CryptoPP/config.h @@ -243,7 +243,7 @@ NAMESPACE_END # pragma warn -8037 #endif -#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) +#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || defined(_STLPORT_VERSION) || defined(ANDROID_NDK) #define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION #endif diff --git a/CryptoPP/misc.cpp b/CryptoPP/misc.cpp index 3c2c2a5f0..93760e3a3 100644 --- a/CryptoPP/misc.cpp +++ b/CryptoPP/misc.cpp @@ -112,13 +112,14 @@ bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count) return acc8 == 0; } -#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) +#if !(defined(_MSC_VER) && (_MSC_VER < 1300)) && !defined(ANDROID_NDK) using std::new_handler; using std::set_new_handler; #endif void CallNewHandler() { +#if !defined(ANDROID_NDK) new_handler newHandler = set_new_handler(NULL); if (newHandler) set_new_handler(newHandler); @@ -127,6 +128,7 @@ void CallNewHandler() newHandler(); else throw std::bad_alloc(); +#endif } #if CRYPTOPP_BOOL_ALIGN16_ENABLED |