summaryrefslogtreecommitdiffstats
path: root/WebServer
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-15 23:24:11 +0200
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-15 23:24:11 +0200
commitd21e4dacf7341b924fa534523ba31348ff6789ad (patch)
tree95a8b355c471cd2ab39e58f3d80b63d64ab8510a /WebServer
parentAdded temporary debug statistics of the RelEntMoveLook packet removal efficiency (diff)
downloadcuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar.gz
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar.bz2
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar.lz
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar.xz
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.tar.zst
cuberite-d21e4dacf7341b924fa534523ba31348ff6789ad.zip
Diffstat (limited to '')
-rw-r--r--WebServer/Socket.cpp4
-rw-r--r--WebServer/base64.cpp3
2 files changed, 7 insertions, 0 deletions
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"