From 987b6ac1232dbafd50b9a6a26fcf769f5bdcd0a6 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 26 Sep 2012 14:36:08 +0000 Subject: Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/health Android: Updated VS2008 project to point to correct Android files Android: Updated makefiles to compile CryptoPP Android: Modified CryptoPP config.h and misc.cpp so it compiles for Android Android: Added pretty MCServer icons git-svn-id: http://mc-server.googlecode.com/svn/trunk@893 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- CryptoPP/config.h | 2 +- CryptoPP/misc.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'CryptoPP') 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 -- cgit v1.2.3