pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android related fixes

Browse source
This commit is contained in:
Dimitris Panokostas 2019-10-22 01:07:03 +02:00
parent 5362785532
commit 7d3d08498b
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/drawing.cpp
View file

@ -2304,7 +2304,7 @@ Don't touch this if you don't know what you are doing. */
#define GETLONG(P) (*(uae_u32 *)P)
#define GETLONG64(P) (*(uae_u64 *)P)
#if defined(CPU_AARCH64) || defined(USE_ARMNEON) && !defined(ANDROID)
#if (defined(CPU_AARCH64) || defined(USE_ARMNEON)) && !defined(ANDROID)
#ifdef __cplusplus
extern "C" {
@ -2482,7 +2482,7 @@ static void pfield_doline (int lineno)
#define DATA_POINTER(n) ((debug_bpl_mask & (1 << n)) ? (line_data[lineno] + (n) * MAX_WORDS_PER_LINE * 2) : (debug_bpl_mask_one ? all_ones : all_zeros))
#if defined(CPU_AARCH64) || defined(USE_ARMNEON) && !defined(ANDROID)
#if (defined(CPU_AARCH64) || defined(USE_ARMNEON)) && !defined(ANDROID)
pfield_doline_n[bplplanecnt](data, wordcount, lineno);
#else
real_bplpt[0] = DATA_POINTER(0);

10
src/osdep/amiberry_hardfile.cpp
View file

@ -108,10 +108,10 @@ int hdf_open_target(struct hardfiledata *hfd, const TCHAR *pname)
if (low == -1) {
// assuming regular file; seek to end and ftell
ret = fseeko(f, 0, SEEK_END);
ret = _fseeki64(f, 0, SEEK_END);
if (ret)
goto end;
low = ftello(f);
low = _ftelli64(f);
if (low == -1)
goto end;
}
@ -203,7 +203,7 @@ static int hdf_seek(struct hardfiledata *hfd, uae_u64 offset)
}
if (hfd->handle_valid == HDF_HANDLE_FILE)
{
auto ret = fseeko(hfd->handle->f, offset, SEEK_SET);
auto ret = _fseeki64(hfd->handle->f, offset, SEEK_SET);
if (ret != 0)
{
write_log("hdf_seek failed\n");
@ -224,14 +224,14 @@ static void poscheck(struct hardfiledata *hfd, int len)
if (hfd->handle_valid == HDF_HANDLE_FILE)
{
ret = fseeko(hfd->handle->f, 0, SEEK_CUR);
ret = _fseeki64(hfd->handle->f, 0, SEEK_CUR);
if (ret)
{
write_log(_T("hd: poscheck failed. seek failure"));
target_startup_msg(_T("Internal error"), _T("hd: poscheck failed. seek failure."));
abort();
}
pos = ftello(hfd->handle->f);
pos = _ftelli64(hfd->handle->f);
}
else if (hfd->handle_valid == HDF_HANDLE_ZFILE)
{

2
src/osdep/picasso96.h
View file

@ -711,6 +711,7 @@ extern int p96refresh_active;
#define CARD_END (CARD_IRQCODE + 11 * 2)
#define CARD_SIZEOF CARD_END
#ifndef ANDROID
#ifdef __cplusplus
extern "C" {
#endif
@ -720,6 +721,7 @@ extern int p96refresh_active;
#ifdef __cplusplus
}
#endif
#endif
#endif