From c6d20104eb1ba2beae266dff7eba655b9ab9576e Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sat, 3 Mar 2012 18:54:47 +0100 Subject: Fix __PCTOOL__ dependencies on SIMULATOR * filesize() is not POSIX, so it doesn't need stubbing or redirecting * make the various directory functions use the sim_ versions for PCTOOL * PCTOOL needs generic byteswap functions * fix the database makefile to not use -DSIMULATOR anymore Change-Id: Ic6abc4f662830b85626c751a472fa4a03e844871 --- firmware/include/dir_uncached.h | 2 +- firmware/include/file.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'firmware/include') diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h index 85f371f..017b86c 100644 --- a/firmware/include/dir_uncached.h +++ b/firmware/include/dir_uncached.h @@ -33,7 +33,7 @@ struct dirinfo { #include #include "file.h" -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) +#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) || defined(__PCTOOL__) # define dirent_uncached sim_dirent # define DIR_UNCACHED SIM_DIR # define opendir_uncached sim_opendir diff --git a/firmware/include/file.h b/firmware/include/file.h index ac856ed..198fccb 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h @@ -47,7 +47,6 @@ extern int app_creat(const char *name, mode_t mode); extern int app_remove(const char* pathname); extern int app_rename(const char* path, const char* newname); # if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) -# define filesize(x) sim_filesize(x) # define fsync(x) sim_fsync(x) # define ftruncate(x,y) sim_ftruncate(x,y) # define lseek(x,y,z) sim_lseek(x,y,z) @@ -60,7 +59,6 @@ extern int app_rename(const char* path, const char* newname); # define creat(x,m) sim_creat(x,m) # define remove(x) sim_remove(x) # define rename(x,y) sim_rename(x,y) -# define filesize(x) sim_filesize(x) # define fsync(x) sim_fsync(x) # define ftruncate(x,y) sim_ftruncate(x,y) # define lseek(x,y,z) sim_lseek(x,y,z) -- cgit v1.1