Commit bcc13058 authored by Simon Morlat's avatar Simon Morlat

fix x86_64 build

parent c72fca89
......@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#endif
#ifndef _WIN32
#if !defined(__QNXNTO__) && !(defined(__ANDROID__) && defined(__LP64__))
#if !defined(__QNXNTO__) && !defined(__ANDROID__)
#include <ctype.h>
#include <langinfo.h>
#include <locale.h>
......@@ -51,7 +51,7 @@ static char *utf8_convert(const char *filename){
wchar_t db_file_utf16[MAX_PATH_SIZE]={0};
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename, -1, db_file_utf16, MAX_PATH_SIZE);
WideCharToMultiByte(CP_UTF8, 0, db_file_utf16, -1, db_file_utf8, sizeof(db_file_utf8), NULL, NULL);
#elif defined(__QNXNTO__) || (defined(__ANDROID__) && defined(__LP64__))
#elif defined(__QNXNTO__) || defined(__ANDROID__)
strncpy(db_file_utf8, filename, MAX_PATH_SIZE - 1);
#else
char db_file_locale[MAX_PATH_SIZE] = {'\0'};
......
......@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef _WIN32
#if !defined(__QNXNTO__) && !(defined(__ANDROID__) && defined(__LP64__))
#if !defined(__QNXNTO__) && !defined(__ANDROID__)
# include <langinfo.h>
# include <locale.h>
# include <iconv.h>
......@@ -281,7 +281,7 @@ static char* ConvertFromUtf8Filename(const char* fName){
}
bctbx_free(wideFilename);
return convertedFilename;
#elif defined(__QNXNTO__) || (defined(__ANDROID__) && defined(__LP64__))
#elif defined(__QNXNTO__) || defined(__ANDROID__)
return bctbx_strdup(fName);
#else
#define MAX_PATH_SIZE 1024
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment