diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 21:49:09 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 21:49:09 +0000 |
commit | 3e400b2ae60a2f21b1892bf29758f8913059f381 (patch) | |
tree | 62d54e7bdc35fc707f7bc90ee92b2d94a0255fba /firmware | |
parent | 77dfff5a5524e0a9d3ae54d8bb61d3c01e6082bb (diff) | |
download | rockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.tar.gz rockbox-3e400b2ae60a2f21b1892bf29758f8913059f381.zip |
Fix checkwps by using host system's file IO (thanks to r25843/r25844) and by including a work around for systems that try to get intN_t via sys/types.h (which should be wrong, but well).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25854 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/include/file.h | 10 | ||||
-rw-r--r-- | firmware/include/sys/types.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h index 2d5c9b88ab..1a43c6ad1d 100644 --- a/firmware/include/file.h +++ b/firmware/include/file.h | |||
@@ -22,12 +22,15 @@ | |||
22 | #ifndef _FILE_H_ | 22 | #ifndef _FILE_H_ |
23 | #define _FILE_H_ | 23 | #define _FILE_H_ |
24 | 24 | ||
25 | #include <sys/types.h> | ||
26 | #include "_ansi.h" | ||
27 | |||
28 | #undef MAX_PATH /* this avoids problems when building simulator */ | 25 | #undef MAX_PATH /* this avoids problems when building simulator */ |
29 | #define MAX_PATH 260 | 26 | #define MAX_PATH 260 |
30 | 27 | ||
28 | #ifdef __PCTOOL__ | ||
29 | #include <fcntl.h> | ||
30 | #else | ||
31 | #include <sys/types.h> | ||
32 | #include "_ansi.h" | ||
33 | |||
31 | #define MAX_OPEN_FILES 11 | 34 | #define MAX_OPEN_FILES 11 |
32 | 35 | ||
33 | #ifndef SEEK_SET | 36 | #ifndef SEEK_SET |
@@ -97,3 +100,4 @@ extern off_t filesize(int fd); | |||
97 | extern int release_files(int volume); | 100 | extern int release_files(int volume); |
98 | int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); | 101 | int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); |
99 | #endif | 102 | #endif |
103 | #endif | ||
diff --git a/firmware/include/sys/types.h b/firmware/include/sys/types.h index 07f9e9c8c7..ecc25fd749 100644 --- a/firmware/include/sys/types.h +++ b/firmware/include/sys/types.h | |||
@@ -30,6 +30,9 @@ | |||
30 | /* | 30 | /* |
31 | * include string.h for size_t for convinence */ | 31 | * include string.h for size_t for convinence */ |
32 | #include <string.h> | 32 | #include <string.h> |
33 | /* make some (debian, ubuntu...) systems happy that inappropriately include | ||
34 | * sys/types.h to get intN_t ... */ | ||
35 | #include <inttypes.h> | ||
33 | 36 | ||
34 | #if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED) | 37 | #if !defined(__ssize_t_defined) && !defined(_SSIZE_T_) && !defined(ssize_t) && !defined(_SSIZE_T_DECLARED) |
35 | #define __ssize_t_defined | 38 | #define __ssize_t_defined |