firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 23:23:02 +01:00
Code Issues

WIP on CORE-3885: Firebird for Android, databases may be created, trivial requests run in embedded mode

Browse Source
This commit is contained in:
alexpeshkoff 2015-02-02 17:14:06 +00:00
parent dba8dcd9e9
commit 7bcfa91654
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/classes/TempFile.cpp
View File

@ -58,6 +58,8 @@ static const char* ENV_VAR = "FIREBIRD_TMP";
static const char* DEFAULT_PATH =
#if defined(UNIX)
"/tmp/";
#elif defined(ANDROID)
"/data/local/tmp/";
#elif defined(WIN_NT)
"c:\\temp\\";
#else

5
src/common/file_params.h
View File

@ -59,9 +59,12 @@ static const char* const PORT_FILE = "fb_port_%d";
#endif
// keep MSG_FILE_LANG in sync with build_file.epp
#ifdef WIN_NT
#if defined(WIN_NT)
static const char* const WORKFILE = "c:\\temp\\";
static const char MSG_FILE_LANG[] = "intl\\%.10s.msg";
#elif defined(ANDROID)
static const char* const WORKFILE = "/data/local/tmp/";
static const char MSG_FILE_LANG[] = "intl/%.10s.msg";
#else
static const char* const WORKFILE = "/tmp/";
static const char MSG_FILE_LANG[] = "intl/%.10s.msg";

2
src/common/isc.cpp
View File

@ -355,7 +355,9 @@ bool ISC_get_user(Firebird::string* name, int* id, int* group)
p = password->pw_name;
else
p = "";
#ifndef ANDROID // Why do they print silly unimplemted message for this function?
endpwent();
#endif
if (name)
*name = p;

2
src/include/cross/android.arme
View File

@ -26,7 +26,7 @@
/* #undef DARWIN */
/* Use binary relocation? */
/* #undef ENABLE_BINRELOC */
#define ENABLE_BINRELOC
/* Alignment of long */
#define FB_ALIGNMENT 8