From d21e4dacf7341b924fa534523ba31348ff6789ad Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Wed, 15 Aug 2012 21:24:11 +0000
Subject: Compiles on Android! Added Eclipse project, import it into your
 workspace and it should be runnable on Android! Disabled Squirrel for Android
 cLog now logs to Android LogCat as well Fixed Lua so it compiles on Android
 Removed/commented out exceptions in JsonCpp so it compiles on Android

git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 WebServer/Socket.cpp | 4 ++++
 WebServer/base64.cpp | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'WebServer')

diff --git a/WebServer/Socket.cpp b/WebServer/Socket.cpp
index 2dde93b22..82c76a8f1 100644
--- a/WebServer/Socket.cpp
+++ b/WebServer/Socket.cpp
@@ -98,7 +98,9 @@ Socket::Socket() :
 
 	if (!IsValid())
 	{
+#if !defined(ANDROID_NDK)
 		throw "INVALID_SOCKET";
+#endif
 	}
 
 	refCounter_ = new int(1);
@@ -354,7 +356,9 @@ SocketSelect::SocketSelect(Socket const * const s1, Socket const * const s2, Typ
 	}
 	if (select(Highest + 1, &fds_, NULL, NULL, NULL) == SOCKET_ERROR)
 	{
+#if !defined(ANDROID_NDK)
 		throw "Error in select";
+#endif
 	}
 }
 
diff --git a/WebServer/base64.cpp b/WebServer/base64.cpp
index 4c19b600b..f505ea6c3 100644
--- a/WebServer/base64.cpp
+++ b/WebServer/base64.cpp
@@ -3,6 +3,9 @@
 
 #include "base64.h"
 #include <iostream>
+#if defined(ANDROID_NDK)
+#include <ctype.h>
+#endif
 
 static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-- 
cgit v1.2.3