Merge branch 'master' into dev/aros
This commit is contained in:
commit
0e08b213f1
|
@ -73,7 +73,7 @@ class cFile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
#if IS_UNIX
|
#if IS_UNIX
|
||||||
typedef int32 File_t;
|
typedef off_t File_t;
|
||||||
|
|
||||||
#else //WIN32
|
#else //WIN32
|
||||||
typedef int64 File_t;
|
typedef int64 File_t;
|
||||||
|
|
|
@ -62,8 +62,8 @@
|
||||||
#include "twcrypto/crypto.h"
|
#include "twcrypto/crypto.h"
|
||||||
#include "core/displayencoder.h"
|
#include "core/displayencoder.h"
|
||||||
|
|
||||||
//Syllable OS doesn't provide swab(), so we'll borrow one from glibc.
|
//Provide a swab() impl. from glibc, for platforms that don't have one
|
||||||
#ifdef __SYLLABLE__
|
#if defined(__SYLLABLE__) || defined(__ANDROID_API__)
|
||||||
void swab (const void *bfrom, void *bto, ssize_t n)
|
void swab (const void *bfrom, void *bto, ssize_t n)
|
||||||
{
|
{
|
||||||
const char *from = (const char *) bfrom;
|
const char *from = (const char *) bfrom;
|
||||||
|
|
|
@ -216,8 +216,12 @@ std::string convert_to_encoded_hex( char ch )
|
||||||
return sstr.str();
|
return sstr.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string util_ConvertMB( const std::string& sIn )
|
std::string util_ConvertMB( const std::string& sIn )
|
||||||
{
|
{
|
||||||
|
#if defined(__ANDROID_API__) || defined(__AROS__)
|
||||||
|
return sIn;
|
||||||
|
#else
|
||||||
cDebug d( "cPolicyParser::util_ConvertMB" );
|
cDebug d( "cPolicyParser::util_ConvertMB" );
|
||||||
|
|
||||||
std::string sOut;
|
std::string sOut;
|
||||||
|
@ -265,5 +269,6 @@ std::string util_ConvertMB( const std::string& sIn )
|
||||||
}
|
}
|
||||||
|
|
||||||
return sOut;
|
return sOut;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue