diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-26 16:36:08 +0200 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-09-26 16:36:08 +0200 |
| commit | 987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6 (patch) | |
| tree | 3f4b98edc89c12f8aa0a96303b32f0b5f5b50dcb /CryptoPP/misc.cpp | |
| parent | Added the block dig animation packet (patch contributed by l0udPL) (diff) | |
| download | cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.gz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.bz2 cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.lz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.xz cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.tar.zst cuberite-987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6.zip | |
Diffstat (limited to '')
| -rw-r--r-- | CryptoPP/misc.cpp | 4 |
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 |