summaryrefslogtreecommitdiffstats
path: root/CryptoPP/misc.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CryptoPP/misc.cpp4
1 files changed, 3 insertions, 1 deletions
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