flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a bug in the inventory system where it would de-sync when dragging items with non-default metadata/health

Browse Source 
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
This commit is contained in:
faketruth
2012-09-26 14:36:08 +00:00
parent fb9a00a64e
commit 987b6ac123
11 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CryptoPP/misc.cpp
View File

@@ -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