Fix compile issue on Android. Fix missing IntToString

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@543 57ff6487-cd31-0410-9ec3-f628ee90f5f0

2 files changed, 7 insertions, 3 deletions

diff --git a/wait.cpp b/wait.cpp
index 1987858..c1bfa00 100644
--- a/wait.cpp
+++ b/wait.cpp
@@ -363,7 +363,7 @@ bool WaitObjectContainer::Wait(unsigned long milliseconds)
 	else if (result == 0)
 		return timeoutIsScheduledEvent;
 	else
-		throw Err("WaitObjectContainer: select failed with error " + errno);
+		throw Err("WaitObjectContainer: select failed with error " + IntToString(errno));
 }
 
 #endif
diff --git a/wait.h b/wait.h
index 045afbc..3a62746 100644
--- a/wait.h
+++ b/wait.h
@@ -10,9 +10,13 @@
 #include <vector>
 
 #ifdef USE_WINDOWS_STYLE_SOCKETS
-#include <winsock2.h>
+# include <winsock2.h>
 #else
-#include <sys/types.h>
+# include <sys/types.h>
+#endif
+
+#if defined(__ANDROID__)
+# include <sys/select.h>
 #endif
 
 #include "hrtimer.h"