From 22b7701fe75cce9afdbc27046821dc089f9e7dac Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 22 Feb 2005 12:19:12 +0000 Subject: Build cleanup and general fixes. fprintf() is now fdprintf(), the separation between uisimulator files and firmware/apps files are better done. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657 --- firmware/include/file.h | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) (limited to 'firmware/include/file.h') diff --git a/firmware/include/file.h b/firmware/include/file.h index af1ad72..694de48 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h @@ -20,6 +20,8 @@ #ifndef _FILE_H_ #define _FILE_H_ +#include + #undef MAX_PATH /* this avoids problems when building simulator */ #define MAX_PATH 260 @@ -42,30 +44,14 @@ #define O_TRUNC 0x10 #endif -#if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) -#define __ssize_t_defined -#define _SSIZE_T_ -#define ssize_t ssize_t -typedef signed long ssize_t; -#endif - -#if !defined(__off_t_defined) && !defined(_OFF_T_) && !defined(off_t) -#define __off_t_defined -#define _OFF_T_ -#define off_t off_t -typedef signed long off_t; -#endif - -#if !defined(__mode_t_defined) && !defined(_MODE_T_) && !defined(mode_t) -#define __mode_t_defined -#define _MODE_T_ -#define mode_t mode_t -typedef unsigned int mode_t; -#endif - -#ifndef _SIZE_T -#define _SIZE_T -typedef unsigned long size_t; +#ifdef SIMULATOR +#define open(x,y) sim_open(x,y) +#define creat(x,y) sim_creat(x,y) +#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) #endif typedef int (*open_func)(const char* pathname, int flags); @@ -75,7 +61,6 @@ typedef ssize_t (*write_func)(int fd, const void *buf, size_t count); typedef void (*qsort_func)(void *base, size_t nmemb, size_t size, int(*_compar)(const void *, const void *)); -#ifndef SIMULATOR extern int open(const char* pathname, int flags); extern int close(int fd); extern int fsync(int fd); @@ -88,6 +73,5 @@ extern int rename(const char* path, const char* newname); extern int ftruncate(int fd, off_t length); extern off_t filesize(int fd); extern int release_files(int volume); -#endif /* SIMULATOR */ #endif -- cgit v1.1