Merge branch 'master' into dev/aros

src/core/file.h

@@ -73,7 +73,7 @@ class  cFile
 {
 public:
 #if IS_UNIX
-	typedef int32 File_t;
+	typedef off_t File_t;
 
 #else //WIN32
     typedef int64 File_t;

src/twadmin/twadmincl.cpp

@@ -62,8 +62,8 @@
 #include "twcrypto/crypto.h"
 #include "core/displayencoder.h"
 
-//Syllable OS doesn't provide swab(), so we'll borrow one from glibc.
-#ifdef __SYLLABLE__
+//Provide a swab() impl. from glibc, for platforms that don't have one
+#if defined(__SYLLABLE__) || defined(__ANDROID_API__)
 void swab (const void *bfrom, void *bto, ssize_t n)
 {
   const char *from = (const char *) bfrom;

src/twparser/policyparser.cpp

@@ -216,8 +216,12 @@ std::string convert_to_encoded_hex( char ch )
     return sstr.str();
 }
 
+
 std::string util_ConvertMB( const std::string& sIn )
 {
+#if defined(__ANDROID_API__) || defined(__AROS__)
+  return sIn;
+#else
     cDebug d( "cPolicyParser::util_ConvertMB" );
 
     std::string                 sOut;
@@ -265,5 +269,6 @@ std::string util_ConvertMB( const std::string& sIn )
     }
 
     return sOut;
+#endif
 }